mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-09-16 18:30:50 +12:00
Adding move data, types, and some Pokemon data
This commit is contained in:
MementoMartha
parent
cdcd29b503
commit
ac45c8b5bc
|
|
@ -171,6 +171,19 @@
|
|||
const SLASH ; a3
|
||||
const SUBSTITUTE ; a4
|
||||
const STRUGGLE ; a5
|
||||
const FAIRY_WIND ; a6
|
||||
const DRAININGKISS ; a7
|
||||
const METAL_SOUND ; a8
|
||||
const MAGNET_BOMB ; a9
|
||||
const IRON_DEFENSE ; aa
|
||||
const DAZZLE_GLEAM ; ab
|
||||
const NIGHT_SLASH ; ac
|
||||
const FEINT_ATTACK ; ad
|
||||
const IRON_HEAD ; ae
|
||||
const BRUTAL_SWING ; af
|
||||
const CHARM ; b0
|
||||
const SWEET_KISS ; b1
|
||||
const BULLET_PUNCH ; b2
|
||||
DEF NUM_ATTACKS EQU const_value - 1
|
||||
|
||||
; Moves do double duty as animation identifiers.
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
const DEX_CHARIZARD ; 6
|
||||
const DEX_SQUIRTLE ; 7
|
||||
const DEX_WARTORTLE ; 8
|
||||
const DEX_BLASTOISE ; 9
|
||||
const DEX_TOTARTLE ; 9
|
||||
const DEX_CATERPIE ; 10
|
||||
const DEX_METAPOD ; 11
|
||||
const DEX_BUTTERFREE ; 12
|
||||
|
|
@ -30,6 +30,7 @@
|
|||
const DEX_ARBOK ; 24
|
||||
const DEX_PIKACHU ; 25
|
||||
const DEX_RAICHU ; 26
|
||||
const DEX_GOROCHU
|
||||
const DEX_SANDSHREW ; 27
|
||||
const DEX_SANDSLASH ; 28
|
||||
const DEX_NIDORAN_F ; 29
|
||||
|
|
@ -38,29 +39,41 @@
|
|||
const DEX_NIDORAN_M ; 32
|
||||
const DEX_NIDORINO ; 33
|
||||
const DEX_NIDOKING ; 34
|
||||
const DEX_NIDOREIGN
|
||||
const DEX_CLEFAIRY ; 35
|
||||
const DEX_CLEFABLE ; 36
|
||||
const DEX_MIKON
|
||||
const DEX_VULPIX ; 37
|
||||
const DEX_NINETALES ; 38
|
||||
const DEX_JIGGLYPUFF ; 39
|
||||
const DEX_WIGGLYTUFF ; 40
|
||||
const DEX_BITTYBAT
|
||||
const DEX_ZUBAT ; 41
|
||||
const DEX_GOLBAT ; 42
|
||||
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
|
||||
const DEX_VENOMOTH ; 49
|
||||
const DEX_CHEEP
|
||||
const DEX_JABETTA
|
||||
const DEX_RIBBITO
|
||||
const DEX_CROAKOZUNA
|
||||
const DEX_DIGLETT ; 50
|
||||
const DEX_DUGTRIO ; 51
|
||||
const DEX_KONYA
|
||||
const DEX_MEOWTH ; 52
|
||||
const DEX_PERSIAN ; 53
|
||||
const DEX_PSYDUCK ; 54
|
||||
const DEX_WEIRDUCK
|
||||
const DEX_GOLDUCK ; 55
|
||||
const DEX_MANKEY ; 56
|
||||
const DEX_PRIMEAPE ; 57
|
||||
const DEX_PUDI
|
||||
const DEX_GROWLITHE ; 58
|
||||
const DEX_ARCANINE ; 59
|
||||
const DEX_POLIWAG ; 60
|
||||
|
|
@ -75,22 +88,33 @@
|
|||
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
|
||||
const DEX_GRAVELER ; 75
|
||||
const DEX_GOLEM ; 76
|
||||
const DEX_BLOTTLE
|
||||
const DEX_PENDRAKEN
|
||||
const DEX_PUCHIKOON
|
||||
const DEX_PONYTA ; 77
|
||||
const DEX_RAPIDASH ; 78
|
||||
const DEX_SLOWPOKE ; 79
|
||||
const DEX_SLOWBRO ; 80
|
||||
const DEX_MAGNEMITE ; 81
|
||||
const DEX_MAGNETITE
|
||||
const DEX_MAGNETON ; 82
|
||||
const DEX_FARFETCHD ; 83
|
||||
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_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
|
||||
|
|
@ -101,14 +125,22 @@
|
|||
const DEX_ONIX ; 95
|
||||
const DEX_DROWZEE ; 96
|
||||
const DEX_HYPNO ; 97
|
||||
const DEX_KOTORA
|
||||
const DEX_GAOTORA
|
||||
const DEX_GOROTORA
|
||||
const DEX_KRABBY ; 98
|
||||
const DEX_KINGLER ; 99
|
||||
const DEX_VOLTORB ; 100
|
||||
const DEX_ELECTRODE ; 101
|
||||
const DEX_CACTUS
|
||||
const DEX_CROCKY
|
||||
const DEX_DEER
|
||||
const DEX_EXEGGCUTE ; 102
|
||||
const DEX_EXEGGUTOR ; 103
|
||||
const DEX_CUBONE ; 104
|
||||
const DEX_MAROWAK ; 105
|
||||
const DEX_GUARDIA
|
||||
const DEX_KANGASKHAN ; 115
|
||||
const DEX_HITMONLEE ; 106
|
||||
const DEX_HITMONCHAN ; 107
|
||||
const DEX_LICKITUNG ; 108
|
||||
|
|
@ -117,26 +149,39 @@
|
|||
const DEX_RHYHORN ; 111
|
||||
const DEX_RHYDON ; 112
|
||||
const DEX_CHANSEY ; 113
|
||||
const DEX_TANGELA ; 114
|
||||
const DEX_KANGASKHAN ; 115
|
||||
const DEX_MONJA
|
||||
const DEX_TANGELA ; 114
|
||||
const DEX_DECILLA
|
||||
const DEX_GYAOON
|
||||
const DEX_OMEGA
|
||||
const DEX_HORSEA ; 116
|
||||
const DEX_SEADRA ; 117
|
||||
const DEX_GYOPIN
|
||||
const DEX_GOLDEEN ; 118
|
||||
const DEX_SEAKING ; 119
|
||||
const DEX_SKIMPER
|
||||
const DEX_BAWLIGUA
|
||||
const DEX_CRYITHAN
|
||||
const DEX_STARYU ; 120
|
||||
const DEX_STARMIE ; 121
|
||||
const DEX_JAGG
|
||||
const DEX_MR_MIME ; 122
|
||||
const DEX_SCYTHER ; 123
|
||||
const DEX_SCIZOR
|
||||
const DEX_PINSIR ; 127
|
||||
const DEX_PURAKKUSU
|
||||
const DEX_JYNX ; 124
|
||||
const DEX_BUU
|
||||
const DEX_ELECTABUZZ ; 125
|
||||
const DEX_MAGMAR ; 126
|
||||
const DEX_PINSIR ; 127
|
||||
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_EEVEE ; 133
|
||||
const DEX_ANIMON
|
||||
const DEX_EEVEE ; 133
|
||||
const DEX_VAPOREON ; 134
|
||||
const DEX_JOLTEON ; 135
|
||||
const DEX_FLAREON ; 136
|
||||
|
|
|
|||
|
|
@ -37,8 +37,8 @@
|
|||
const BLASTOISE ; $1C
|
||||
const PINSIR ; $1D
|
||||
const TANGELA ; $1E
|
||||
const_skip ; $1F
|
||||
const_skip ; $20
|
||||
const GYAOON ; $1F (new)
|
||||
const NIDOREIGN ; $20 (new)
|
||||
const GROWLITHE ; $21
|
||||
const ONIX ; $22
|
||||
const FEAROW ; $23
|
||||
|
|
@ -56,26 +56,26 @@
|
|||
const PSYDUCK ; $2F
|
||||
const DROWZEE ; $30
|
||||
const GOLEM ; $31
|
||||
const_skip ; $32
|
||||
const BARUNDA ; $32 (new)
|
||||
const MAGMAR ; $33
|
||||
const_skip ; $34
|
||||
const BUU ; $34 (new)
|
||||
const ELECTABUZZ ; $35
|
||||
const MAGNETON ; $36
|
||||
const KOFFING ; $37
|
||||
const_skip ; $38
|
||||
const DEER ; $38 (new)
|
||||
const MANKEY ; $39
|
||||
const SEEL ; $3A
|
||||
const DIGLETT ; $3B
|
||||
const TAUROS ; $3C
|
||||
const_skip ; $3D
|
||||
const_skip ; $3E
|
||||
const_skip ; $3F
|
||||
const TRAMPEL ; $3D (new)
|
||||
const CROCKY ; $3E (new)
|
||||
const BLOTTLE ; $3F (new)
|
||||
const FARFETCHD ; $40
|
||||
const VENONAT ; $41
|
||||
const DRAGONITE ; $42
|
||||
const_skip ; $43
|
||||
const_skip ; $44
|
||||
const_skip ; $45
|
||||
const CACTUS ; $43 (new)
|
||||
const JAGG ; $44 (new)
|
||||
const BITTYBAT ; $45 (new)
|
||||
const DODUO ; $46
|
||||
const POLIWAG ; $47
|
||||
const JYNX ; $48
|
||||
|
|
@ -85,23 +85,23 @@
|
|||
const DITTO ; $4C
|
||||
const MEOWTH ; $4D
|
||||
const KRABBY ; $4E
|
||||
const_skip ; $4F
|
||||
const_skip ; $50
|
||||
const_skip ; $51
|
||||
const CHEEP ; $4F (new)
|
||||
const JABETTA ; $50 (new)
|
||||
const MIKON ; $51 (new)
|
||||
const VULPIX ; $52
|
||||
const NINETALES ; $53
|
||||
const PIKACHU ; $54
|
||||
const RAICHU ; $55
|
||||
const_skip ; $56
|
||||
const_skip ; $57
|
||||
const RIBBITO ; $56 (new)
|
||||
const CROAKOZUNA ; $57 (new)
|
||||
const DRATINI ; $58
|
||||
const DRAGONAIR ; $59
|
||||
const KABUTO ; $5A
|
||||
const KABUTOPS ; $5B
|
||||
const HORSEA ; $5C
|
||||
const SEADRA ; $5D
|
||||
const_skip ; $5E
|
||||
const_skip ; $5F
|
||||
const BAWLIGUA ; $5E (new)
|
||||
const CRYITHAN ; $5F (new)
|
||||
const SANDSHREW ; $60
|
||||
const SANDSLASH ; $61
|
||||
const OMANYTE ; $62
|
||||
|
|
@ -121,38 +121,38 @@
|
|||
const WEEDLE ; $70
|
||||
const KAKUNA ; $71
|
||||
const BEEDRILL ; $72
|
||||
const_skip ; $73
|
||||
const MADAAMU ; $73 (new)
|
||||
const DODRIO ; $74
|
||||
const PRIMEAPE ; $75
|
||||
const DUGTRIO ; $76
|
||||
const VENOMOTH ; $77
|
||||
const DEWGONG ; $78
|
||||
const_skip ; $79
|
||||
const_skip ; $7A
|
||||
const PURAKKUSU ; $79 (new)
|
||||
const PENDRAKEN ; $7A (new)
|
||||
const CATERPIE ; $7B
|
||||
const METAPOD ; $7C
|
||||
const BUTTERFREE ; $7D
|
||||
const MACHAMP ; $7E
|
||||
const_skip ; $7F
|
||||
const WEIRDUCK ; $7F (new)
|
||||
const GOLDUCK ; $80
|
||||
const HYPNO ; $81
|
||||
const GOLBAT ; $82
|
||||
const MEWTWO ; $83
|
||||
const SNORLAX ; $84
|
||||
const MAGIKARP ; $85
|
||||
const_skip ; $86
|
||||
const_skip ; $87
|
||||
const KONYA ; $86 (new)
|
||||
const OMEGA ; $87 (new)
|
||||
const MUK ; $88
|
||||
const_skip ; $89
|
||||
const DECILLA ; $89 (new)
|
||||
const KINGLER ; $8A
|
||||
const CLOYSTER ; $8B
|
||||
const_skip ; $8C
|
||||
const MAGNETITE ; $8C (new)
|
||||
const ELECTRODE ; $8D
|
||||
const CLEFABLE ; $8E
|
||||
const WEEZING ; $8F
|
||||
const PERSIAN ; $90
|
||||
const MAROWAK ; $91
|
||||
const_skip ; $92
|
||||
const GUARDIA ; $92 (new)
|
||||
const HAUNTER ; $93
|
||||
const ABRA ; $94
|
||||
const ALAKAZAM ; $95
|
||||
|
|
@ -162,13 +162,13 @@
|
|||
const BULBASAUR ; $99
|
||||
const VENUSAUR ; $9A
|
||||
const TENTACRUEL ; $9B
|
||||
const_skip ; $9C
|
||||
const GYOPIN ; $9C (new)
|
||||
const GOLDEEN ; $9D
|
||||
const SEAKING ; $9E
|
||||
const_skip ; $9F
|
||||
const_skip ; $A0
|
||||
const_skip ; $A1
|
||||
const_skip ; $A2
|
||||
const KOTORA ; $9F (new)
|
||||
const GAOTORA ; $A0 (new)
|
||||
const GOROTORA ; $A1 (new)
|
||||
const PUCHIKOON ; $A2 (new)
|
||||
const PONYTA ; $A3
|
||||
const RAPIDASH ; $A4
|
||||
const RATTATA ; $A5
|
||||
|
|
@ -178,25 +178,34 @@
|
|||
const GEODUDE ; $A9
|
||||
const PORYGON ; $AA
|
||||
const AERODACTYL ; $AB
|
||||
const_skip ; $AC
|
||||
const BLASTYKE ; $AC (new)
|
||||
const MAGNEMITE ; $AD
|
||||
const_skip ; $AE
|
||||
const_skip ; $AF
|
||||
const SKIMPER ; $AE (new)
|
||||
const GOROCHU ; $AF (new)
|
||||
const CHARMANDER ; $B0
|
||||
const SQUIRTLE ; $B1
|
||||
const CHARMELEON ; $B2
|
||||
const WARTORTLE ; $B3
|
||||
const CHARIZARD ; $B4
|
||||
const_skip ; $B5
|
||||
const FOSSIL_KABUTOPS ; $B6
|
||||
const FOSSIL_AERODACTYL ; $B7
|
||||
const MON_GHOST ; $B8
|
||||
const TOTARTLE ; $B5 (new)
|
||||
const FOSSIL_KABUTOPS ; $B6 (missingno.)
|
||||
const FOSSIL_AERODACTYL ; $B7 (missingno.)
|
||||
const MON_GHOST ; $B8 (missingno.)
|
||||
const ODDISH ; $B9
|
||||
const GLOOM ; $BA
|
||||
const VILEPLUME ; $BB
|
||||
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)
|
||||
|
||||
DEF NUM_POKEMON_INDEXES EQU const_value - 1
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ DEF PHYSICAL EQU const_value
|
|||
const BIRD ; $06
|
||||
const BUG ; $07
|
||||
const GHOST ; $08
|
||||
const STEEL ; $09
|
||||
|
||||
const_next 20
|
||||
|
||||
|
|
@ -22,5 +23,7 @@ DEF SPECIAL EQU const_value
|
|||
const PSYCHIC_TYPE ; $18
|
||||
const ICE ; $19
|
||||
const DRAGON ; $1A
|
||||
const DARK ; $1B
|
||||
const FAIRY ; $1C
|
||||
|
||||
DEF NUM_TYPES EQU const_value
|
||||
|
|
|
|||
|
|
@ -165,6 +165,19 @@ AttackAnimationPointers:
|
|||
dw SlashAnim
|
||||
dw SubstituteAnim
|
||||
dw StruggleAnim
|
||||
dw FairyWindAnim
|
||||
dw DrainingKissAnim
|
||||
dw MetalSoundAnim
|
||||
dw MagnetBombAnim
|
||||
dw IronDefenseAnim
|
||||
dw DazzleGleamAnim
|
||||
dw NightSlashAnim
|
||||
dw FeintAttackAnim
|
||||
dw IronHeadAnim
|
||||
dw BrutalSwingAnim
|
||||
dw CharmAnim
|
||||
dw SweetKissAnim
|
||||
dw BulletPunchAnim
|
||||
assert_table_length NUM_ATTACKS
|
||||
dw ShowPicAnim
|
||||
dw EnemyFlashAnim
|
||||
|
|
@ -243,6 +256,7 @@ DoubleSlapAnim:
|
|||
battle_anim DOUBLESLAP, SUBANIM_01, 0, 5
|
||||
db -1 ; end
|
||||
|
||||
BulletPunchAnim:
|
||||
CometPunchAnim:
|
||||
battle_anim COMET_PUNCH, SUBANIM_02, 0, 4
|
||||
battle_anim COMET_PUNCH, SUBANIM_02, 0, 4
|
||||
|
|
@ -282,6 +296,7 @@ VicegripAnim:
|
|||
battle_anim VICEGRIP, SUBANIM_2A, 0, 8
|
||||
db -1 ; end
|
||||
|
||||
NightSlashAnim:
|
||||
GuillotineAnim:
|
||||
battle_anim GUILLOTINE, SUBANIM_2A, 0, 6
|
||||
db -1 ; end
|
||||
|
|
@ -301,6 +316,7 @@ CutAnim:
|
|||
battle_anim NO_MOVE, SUBANIM_16, 0, 4
|
||||
db -1 ; end
|
||||
|
||||
FairyWindAnim:
|
||||
GustAnim:
|
||||
battle_anim GUST, SUBANIM_10, 1, 6
|
||||
battle_anim NO_MOVE, SUBANIM_02, 0, 6
|
||||
|
|
@ -410,6 +426,7 @@ ThrashAnim:
|
|||
battle_anim THRASH, SUBANIM_04, 1, 6
|
||||
db -1 ; end
|
||||
|
||||
IronHeadAnim:
|
||||
DoubleEdgeAnim:
|
||||
battle_anim LEECH_SEED, SE_LIGHT_SCREEN_PALETTE
|
||||
battle_anim NO_MOVE, SUBANIM_2D, 0, 6
|
||||
|
|
@ -565,6 +582,7 @@ DrillPeckAnim:
|
|||
battle_anim DRILL_PECK, SUBANIM_04, 1, 6
|
||||
db -1 ; end
|
||||
|
||||
BrutalSwingAnim:
|
||||
SubmissionAnim:
|
||||
battle_anim SUBMISSION, SE_SLIDE_MON_OFF
|
||||
battle_anim NO_MOVE, SUBANIM_01, 0, 6
|
||||
|
|
@ -603,6 +621,7 @@ StrengthAnim:
|
|||
battle_anim FIRE_PUNCH, SUBANIM_04, 1, 6
|
||||
db -1 ; end
|
||||
|
||||
DrainingKissAnim:
|
||||
AbsorbAnim:
|
||||
battle_anim ABSORB, SE_LIGHT_SCREEN_PALETTE
|
||||
battle_anim NO_MOVE, SUBANIM_21, 0, 6
|
||||
|
|
@ -751,6 +770,7 @@ AgilityAnim:
|
|||
battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE
|
||||
db -1 ; end
|
||||
|
||||
FeintAttackAnim:
|
||||
QuickAttackAnim:
|
||||
battle_anim QUICK_ATTACK, SE_SLIDE_MON_OFF
|
||||
battle_anim NO_MOVE, SUBANIM_04, 1, 6
|
||||
|
|
@ -776,6 +796,7 @@ MimicAnim:
|
|||
battle_anim MIMIC, SUBANIM_22, 1, 6
|
||||
db -1 ; end
|
||||
|
||||
MetalSoundAnim:
|
||||
ScreechAnim:
|
||||
battle_anim SCREECH, SUBANIM_12, 1, 6
|
||||
db -1 ; end
|
||||
|
|
@ -799,6 +820,7 @@ RecoverAnim:
|
|||
battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE
|
||||
db -1 ; end
|
||||
|
||||
IronDefenseAnim:
|
||||
HardenAnim:
|
||||
battle_anim HARDEN, SE_LIGHT_SCREEN_PALETTE
|
||||
battle_anim NO_MOVE, SUBANIM_43, 1, 6
|
||||
|
|
@ -903,6 +925,7 @@ SelfdestructAnim:
|
|||
battle_anim SELFDESTRUCT, SUBANIM_34, 1, 3
|
||||
db -1 ; end
|
||||
|
||||
MagnetBombAnim:
|
||||
EggBombAnim:
|
||||
battle_anim EGG_BOMB, SUBANIM_41, 1, 4
|
||||
battle_anim EGG_BOMB, SUBANIM_42, 1, 4
|
||||
|
|
@ -1019,6 +1042,8 @@ LeechLifeAnim:
|
|||
battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH
|
||||
db -1 ; end
|
||||
|
||||
SweetKissAnim:
|
||||
CharmAnim:
|
||||
LovelyKissAnim:
|
||||
battle_anim LOVELY_KISS, SUBANIM_12, 0, 6
|
||||
db -1 ; end
|
||||
|
|
@ -1052,6 +1077,7 @@ SporeAnim:
|
|||
battle_anim SPORE, SUBANIM_36, 0, 6
|
||||
db -1 ; end
|
||||
|
||||
DazzleGleamAnim:
|
||||
FlashAnim:
|
||||
battle_anim LEECH_SEED, SE_LIGHT_SCREEN_PALETTE
|
||||
battle_anim GLARE, SE_DARK_SCREEN_FLASH
|
||||
|
|
|
|||
|
|
@ -176,4 +176,17 @@ Moves:
|
|||
move SLASH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 20
|
||||
move SUBSTITUTE, SUBSTITUTE_EFFECT, 0, NORMAL, 100, 10
|
||||
move STRUGGLE, RECOIL_EFFECT, 50, NORMAL, 100, 10
|
||||
move FAIRY_WIND, NO_ADDITIONAL_EFFECT, 40, FAIRY, 100, 30
|
||||
move DRAININGKISS, DRAIN_HP_EFFECT, 50, FAIRY, 100, 10
|
||||
move METAL_SOUND, SPECIAL_DOWN2_EFFECT, 0, STEEL, 85, 40
|
||||
move MAGNET_BOMB, SWIFT_EFFECT, 60, STEEL, 100, 20
|
||||
move IRON_DEFENSE, DEFENSE_UP2_EFFECT, 0, STEEL, 100, 15
|
||||
move DAZZLE_GLEAM, NO_ADDITIONAL_EFFECT, 80, FAIRY, 100, 10
|
||||
move NIGHT_SLASH, NO_ADDITIONAL_EFFECT, 70, DARK, 100, 15
|
||||
move FEINT_ATTACK, SWIFT_EFFECT, 60, DARK, 100, 20
|
||||
move IRON_HEAD, FLINCH_SIDE_EFFECT2, 80, STEEL, 100, 15
|
||||
move BRUTAL_SWING, NO_ADDITIONAL_EFFECT, 60, DARK, 100, 20
|
||||
move CHARM, ATTACK_DOWN2_EFFECT, 0, FAIRY, 100, 20
|
||||
move SWEET_KISS, CONFUSION_EFFECT, 0, FAIRY, 75, 10
|
||||
move BULLET_PUNCH, NO_ADDITIONAL_EFFECT, 40, STEEL, 100, 30
|
||||
assert_table_length NUM_ATTACKS
|
||||
|
|
|
|||
|
|
@ -165,4 +165,17 @@ MoveNames::
|
|||
li "SLASH"
|
||||
li "SUBSTITUTE"
|
||||
li "STRUGGLE"
|
||||
li "FAIRY WIND"
|
||||
li "DRAININGKISS"
|
||||
li "METAL SOUND"
|
||||
li "MAGNET BOMB"
|
||||
li "IRON DEFENSE"
|
||||
li "DAZZLE GLEAM"
|
||||
li "NIGHT SLASH"
|
||||
li "FEINT ATTACK"
|
||||
li "IRON HEAD"
|
||||
li "BRUTAL SWING"
|
||||
li "CHARM"
|
||||
li "SWEET KISS"
|
||||
li "BULLET PUNCH"
|
||||
assert_list_length NUM_ATTACKS
|
||||
|
|
|
|||
|
|
@ -166,5 +166,18 @@ MoveSoundTable:
|
|||
db SFX_NOT_VERY_EFFECTIVE, $01, $ff ; SLASH
|
||||
db SFX_BATTLE_2C, $d8, $04 ; SUBSTITUTE
|
||||
db SFX_BATTLE_0B, $00, $80 ; STRUGGLE
|
||||
db SFX_BATTLE_12, $00, $c0 ; FAIRY_WIND
|
||||
db SFX_BATTLE_24, $00, $80 ; DRAININGKISS
|
||||
db SFX_BATTLE_31, $00, $80 ; METAL_SOUND
|
||||
db SFX_BATTLE_34, $00, $40 ; MAGNET_BOMB
|
||||
db SFX_BATTLE_14, $11, $20 ; IRON_DEFENSE
|
||||
db SFX_BATTLE_13, $f8, $ff ; DAZZLE_GLEAM
|
||||
db SFX_BATTLE_0F, $00, $80 ; NIGHT_SLASH
|
||||
db SFX_BATTLE_25, $00, $10 ; FEINT_ATTACK
|
||||
db SFX_SUPER_EFFECTIVE, $20, $c0 ; IRON_HEAD
|
||||
db SFX_BATTLE_23, $01, $c0 ; BRUTAL_SWING
|
||||
db SFX_BATTLE_09, $88, $10 ; CHARM
|
||||
db SFX_BATTLE_09, $88, $10 ; SWEET_KISS
|
||||
db SFX_BATTLE_0B, $01, $80 ; BULLET_PUNCH
|
||||
assert_table_length NUM_ATTACKS
|
||||
db SFX_BATTLE_0B, $00, $80
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ MonPartyData:
|
|||
nybble ICON_MON ; Charizard
|
||||
nybble ICON_WATER ; Squirtle
|
||||
nybble ICON_WATER ; Wartortle
|
||||
nybble ICON_WATER ; Blastoise
|
||||
nybble ICON_WATER ; Totartle
|
||||
nybble ICON_BUG ; Caterpie
|
||||
nybble ICON_BUG ; Metapod
|
||||
nybble ICON_BUG ; Butterfree
|
||||
|
|
@ -26,6 +26,7 @@ MonPartyData:
|
|||
nybble ICON_SNAKE ; Arbok
|
||||
nybble ICON_FAIRY ; Pikachu
|
||||
nybble ICON_FAIRY ; Raichu
|
||||
nybble ICON_FAIRY ; Gorochu
|
||||
nybble ICON_MON ; Sandshrew
|
||||
nybble ICON_MON ; Sandslash
|
||||
nybble ICON_MON ; NidoranF
|
||||
|
|
@ -34,29 +35,41 @@ MonPartyData:
|
|||
nybble ICON_MON ; NidoranM
|
||||
nybble ICON_MON ; Nidorino
|
||||
nybble ICON_MON ; Nidoking
|
||||
nybble ICON_MON ; Nidoreign
|
||||
nybble ICON_FAIRY ; Clefairy
|
||||
nybble ICON_FAIRY ; Clefable
|
||||
nybble ICON_QUADRUPED ; Mikon
|
||||
nybble ICON_QUADRUPED ; Vulpix
|
||||
nybble ICON_QUADRUPED ; Ninetales
|
||||
nybble ICON_FAIRY ; Jigglypuff
|
||||
nybble ICON_FAIRY ; Wigglytuff
|
||||
nybble ICON_MON ; Bittybat
|
||||
nybble ICON_MON ; Zubat
|
||||
nybble ICON_MON ; Golbat
|
||||
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
|
||||
nybble ICON_BUG ; Venomoth
|
||||
nybble ICON_WATER ; Cheep
|
||||
nybble ICON_WATER ; Jabetta
|
||||
nybble ICON_MON ; Ribbito
|
||||
nybble ICON_MON ; Croakozuna
|
||||
nybble ICON_MON ; Diglett
|
||||
nybble ICON_MON ; Dugtrio
|
||||
nybble ICON_MON ; Konya
|
||||
nybble ICON_MON ; Meowth
|
||||
nybble ICON_MON ; Persian
|
||||
nybble ICON_MON ; Psyduck
|
||||
nybble ICON_MON ; Weirduck
|
||||
nybble ICON_MON ; Golduck
|
||||
nybble ICON_MON ; Mankey
|
||||
nybble ICON_MON ; Primeape
|
||||
nybble ICON_QUADRUPED ; Pudi
|
||||
nybble ICON_QUADRUPED ; Growlithe
|
||||
nybble ICON_QUADRUPED ; Arcanine
|
||||
nybble ICON_MON ; Poliwag
|
||||
|
|
@ -71,22 +84,33 @@ 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
|
||||
nybble ICON_MON ; Graveler
|
||||
nybble ICON_MON ; Golem
|
||||
nybble ICON_WATER ; Blottle
|
||||
nybble ICON_WATER ; Pendraken
|
||||
nybble ICON_QUADRUPED ; Puchikoon
|
||||
nybble ICON_QUADRUPED ; Ponyta
|
||||
nybble ICON_QUADRUPED ; Rapidash
|
||||
nybble ICON_QUADRUPED ; Slowpoke
|
||||
nybble ICON_MON ; Slowbro
|
||||
nybble ICON_BALL ; Magnemite
|
||||
nybble ICON_BALL ; Magnetite
|
||||
nybble ICON_BALL ; Magneton
|
||||
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
|
||||
|
|
@ -97,14 +121,22 @@ MonPartyData:
|
|||
nybble ICON_SNAKE ; Onix
|
||||
nybble ICON_MON ; Drowzee
|
||||
nybble ICON_MON ; Hypno
|
||||
nybble ICON_QUADRUPED ; Kotora
|
||||
nybble ICON_QUADRUPED ; Gaotora
|
||||
nybble ICON_QUADRUPED ; Gorotora
|
||||
nybble ICON_WATER ; Krabby
|
||||
nybble ICON_WATER ; Kingler
|
||||
nybble ICON_BALL ; Voltorb
|
||||
nybble ICON_BALL ; Electrode
|
||||
nybble ICON_GRASS ; Cactus
|
||||
nybble ICON_MON ; Crocky
|
||||
nybble ICON_QUADRUPED ; Deer
|
||||
nybble ICON_GRASS ; Exeggcute
|
||||
nybble ICON_GRASS ; Exeggutor
|
||||
nybble ICON_MON ; Cubone
|
||||
nybble ICON_MON ; Marowak
|
||||
nybble ICON_MON ; Guardia
|
||||
nybble ICON_MON ; Kangaskhan
|
||||
nybble ICON_MON ; Hitmonlee
|
||||
nybble ICON_MON ; Hitmonchan
|
||||
nybble ICON_MON ; Lickitung
|
||||
|
|
@ -113,25 +145,38 @@ MonPartyData:
|
|||
nybble ICON_QUADRUPED ; Rhyhorn
|
||||
nybble ICON_MON ; Rhydon
|
||||
nybble ICON_FAIRY ; Chansey
|
||||
nybble ICON_GRASS ; Monja
|
||||
nybble ICON_GRASS ; Tangela
|
||||
nybble ICON_MON ; Kangaskhan
|
||||
nybble ICON_MON ; Decilla
|
||||
nybble ICON_MON ; Gyaoon
|
||||
nybble ICON_MON ; Omega
|
||||
nybble ICON_WATER ; Horsea
|
||||
nybble ICON_WATER ; Seadra
|
||||
nybble ICON_WATER ; Gyopin
|
||||
nybble ICON_WATER ; Goldeen
|
||||
nybble ICON_WATER ; Seaking
|
||||
nybble ICON_MON ; Skimper
|
||||
nybble ICON_MON ; Bawligua
|
||||
nybble ICON_MON ; Cryithan
|
||||
nybble ICON_HELIX ; Staryu
|
||||
nybble ICON_HELIX ; Starmie
|
||||
nybble ICON_WATER ; Jagg
|
||||
nybble ICON_MON ; Mr.Mime
|
||||
nybble ICON_BUG ; Scyther
|
||||
nybble ICON_BUG ; Scizor
|
||||
nybble ICON_BUG ; Pinsir
|
||||
nybble ICON_BUG ; Purakkusu
|
||||
nybble ICON_MON ; Jynx
|
||||
nybble ICON_MON ; Buu
|
||||
nybble ICON_MON ; Electabuzz
|
||||
nybble ICON_MON ; Magmar
|
||||
nybble ICON_BUG ; Pinsir
|
||||
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
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ MonsterNames::
|
|||
db "BLASTOISE@"
|
||||
db "PINSIR@@@@"
|
||||
db "TANGELA@@@"
|
||||
db "MISSINGNO."
|
||||
db "MISSINGNO."
|
||||
db "GYAOON@@@@"
|
||||
db "NIDOREIGN@"
|
||||
db "GROWLITHE@"
|
||||
db "ONIX@@@@@@"
|
||||
db "FEAROW@@@@"
|
||||
|
|
@ -49,26 +49,26 @@ MonsterNames::
|
|||
db "PSYDUCK@@@"
|
||||
db "DROWZEE@@@"
|
||||
db "GOLEM@@@@@"
|
||||
db "MISSINGNO."
|
||||
db "BARUNDA@@@"
|
||||
db "MAGMAR@@@@"
|
||||
db "MISSINGNO."
|
||||
db "BUU@@@@@@@"
|
||||
db "ELECTABUZZ"
|
||||
db "MAGNETON@@"
|
||||
db "KOFFING@@@"
|
||||
db "MISSINGNO."
|
||||
db "DEER@@@@@@"
|
||||
db "MANKEY@@@@"
|
||||
db "SEEL@@@@@@"
|
||||
db "DIGLETT@@@"
|
||||
db "TAUROS@@@@"
|
||||
db "MISSINGNO."
|
||||
db "MISSINGNO."
|
||||
db "MISSINGNO."
|
||||
db "TRAMPEL@@@"
|
||||
db "CROCKY@@@@"
|
||||
db "BLOTTLE@@@"
|
||||
db "FARFETCH'D"
|
||||
db "VENONAT@@@"
|
||||
db "DRAGONITE@"
|
||||
db "MISSINGNO."
|
||||
db "MISSINGNO."
|
||||
db "MISSINGNO."
|
||||
db "CACTUS@@@@"
|
||||
db "JAGG@@@@@@"
|
||||
db "BITTYBAT@@"
|
||||
db "DODUO@@@@@"
|
||||
db "POLIWAG@@@"
|
||||
db "JYNX@@@@@@"
|
||||
|
|
@ -78,23 +78,23 @@ MonsterNames::
|
|||
db "DITTO@@@@@"
|
||||
db "MEOWTH@@@@"
|
||||
db "KRABBY@@@@"
|
||||
db "MISSINGNO."
|
||||
db "MISSINGNO."
|
||||
db "MISSINGNO."
|
||||
db "CHEEP@@@@@"
|
||||
db "JABETTA@@@"
|
||||
db "MIKON@@@@@"
|
||||
db "VULPIX@@@@"
|
||||
db "NINETALES@"
|
||||
db "PIKACHU@@@"
|
||||
db "RAICHU@@@@"
|
||||
db "MISSINGNO."
|
||||
db "MISSINGNO."
|
||||
db "RIBBITO@@@"
|
||||
db "CROAKOZUNA"
|
||||
db "DRATINI@@@"
|
||||
db "DRAGONAIR@"
|
||||
db "KABUTO@@@@"
|
||||
db "KABUTOPS@@"
|
||||
db "HORSEA@@@@"
|
||||
db "SEADRA@@@@"
|
||||
db "MISSINGNO."
|
||||
db "MISSINGNO."
|
||||
db "BAWLIGUA@@"
|
||||
db "CRYITHAN@@"
|
||||
db "SANDSHREW@"
|
||||
db "SANDSLASH@"
|
||||
db "OMANYTE@@@"
|
||||
|
|
@ -114,38 +114,38 @@ MonsterNames::
|
|||
db "WEEDLE@@@@"
|
||||
db "KAKUNA@@@@"
|
||||
db "BEEDRILL@@"
|
||||
db "MISSINGNO."
|
||||
db "MADAAMU@@@"
|
||||
db "DODRIO@@@@"
|
||||
db "PRIMEAPE@@"
|
||||
db "DUGTRIO@@@"
|
||||
db "VENOMOTH@@"
|
||||
db "DEWGONG@@@"
|
||||
db "MISSINGNO."
|
||||
db "MISSINGNO."
|
||||
db "PURAKKUSU@"
|
||||
db "PENDRAKEN@"
|
||||
db "CATERPIE@@"
|
||||
db "METAPOD@@@"
|
||||
db "BUTTERFREE"
|
||||
db "MACHAMP@@@"
|
||||
db "MISSINGNO."
|
||||
db "WEIRDUCK@@"
|
||||
db "GOLDUCK@@@"
|
||||
db "HYPNO@@@@@"
|
||||
db "GOLBAT@@@@"
|
||||
db "MEWTWO@@@@"
|
||||
db "SNORLAX@@@"
|
||||
db "MAGIKARP@@"
|
||||
db "MISSINGNO."
|
||||
db "MISSINGNO."
|
||||
db "KONYA@@@@@"
|
||||
db "OMEGA@@@@@"
|
||||
db "MUK@@@@@@@"
|
||||
db "MISSINGNO."
|
||||
db "DECILLA@@@"
|
||||
db "KINGLER@@@"
|
||||
db "CLOYSTER@@"
|
||||
db "MISSINGNO."
|
||||
db "MAGNETITE@"
|
||||
db "ELECTRODE@"
|
||||
db "CLEFABLE@@"
|
||||
db "WEEZING@@@"
|
||||
db "PERSIAN@@@"
|
||||
db "MAROWAK@@@"
|
||||
db "MISSINGNO."
|
||||
db "GUARDIA@@@"
|
||||
db "HAUNTER@@@"
|
||||
db "ABRA@@@@@@"
|
||||
db "ALAKAZAM@@"
|
||||
|
|
@ -155,13 +155,13 @@ MonsterNames::
|
|||
db "BULBASAUR@"
|
||||
db "VENUSAUR@@"
|
||||
db "TENTACRUEL"
|
||||
db "MISSINGNO."
|
||||
db "GYOPIN@@@@"
|
||||
db "GOLDEEN@@@"
|
||||
db "SEAKING@@@"
|
||||
db "MISSINGNO."
|
||||
db "MISSINGNO."
|
||||
db "MISSINGNO."
|
||||
db "MISSINGNO."
|
||||
db "KOTORA@@@@"
|
||||
db "GAOTORA@@@"
|
||||
db "GOROTORA@@"
|
||||
db "PUCHIKOON@"
|
||||
db "PONYTA@@@@"
|
||||
db "RAPIDASH@@"
|
||||
db "RATTATA@@@"
|
||||
|
|
@ -171,16 +171,16 @@ MonsterNames::
|
|||
db "GEODUDE@@@"
|
||||
db "PORYGON@@@"
|
||||
db "AERODACTYL"
|
||||
db "MISSINGNO."
|
||||
db "BLASTYKE@@"
|
||||
db "MAGNEMITE@"
|
||||
db "MISSINGNO."
|
||||
db "MISSINGNO."
|
||||
db "SKIMPER@@@"
|
||||
db "GOROCHU@@@"
|
||||
db "CHARMANDER"
|
||||
db "SQUIRTLE@@"
|
||||
db "CHARMELEON"
|
||||
db "WARTORTLE@"
|
||||
db "CHARIZARD@"
|
||||
db "MISSINGNO."
|
||||
db "TOTARTLE@@"
|
||||
db "MISSINGNO."
|
||||
db "MISSINGNO."
|
||||
db "MISSINGNO."
|
||||
|
|
@ -190,4 +190,13 @@ 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@@@@"
|
||||
assert_table_length NUM_POKEMON_INDEXES
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ MonsterPalettes:
|
|||
db PAL_REDMON ; CHARIZARD
|
||||
db PAL_CYANMON ; SQUIRTLE
|
||||
db PAL_CYANMON ; WARTORTLE
|
||||
db PAL_CYANMON ; BLASTOISE
|
||||
db PAL_CYANMON ; TOTARTLE
|
||||
db PAL_GREENMON ; CATERPIE
|
||||
db PAL_GREENMON ; METAPOD
|
||||
db PAL_CYANMON ; BUTTERFREE
|
||||
|
|
@ -19,14 +19,15 @@ MonsterPalettes:
|
|||
db PAL_BROWNMON ; PIDGEY
|
||||
db PAL_BROWNMON ; PIDGEOTTO
|
||||
db PAL_BROWNMON ; PIDGEOT
|
||||
db PAL_GREYMON ; RATTATA
|
||||
db PAL_GREYMON ; RATICATE
|
||||
db PAL_PURPLEMON ; RATTATA
|
||||
db PAL_BROWNMON ; RATICATE
|
||||
db PAL_BROWNMON ; SPEAROW
|
||||
db PAL_BROWNMON ; FEAROW
|
||||
db PAL_PURPLEMON ; EKANS
|
||||
db PAL_PURPLEMON ; ARBOK
|
||||
db PAL_YELLOWMON ; PIKACHU
|
||||
db PAL_YELLOWMON ; RAICHU
|
||||
db PAL_YELLOWMON ; GOROCHU
|
||||
db PAL_BROWNMON ; SANDSHREW
|
||||
db PAL_BROWNMON ; SANDSLASH
|
||||
db PAL_BLUEMON ; NIDORAN_F
|
||||
|
|
@ -35,30 +36,42 @@ MonsterPalettes:
|
|||
db PAL_PURPLEMON ; NIDORAN_M
|
||||
db PAL_PURPLEMON ; NIDORINO
|
||||
db PAL_PURPLEMON ; NIDOKING
|
||||
db PAL_GREYMON ; NIDOREIGN
|
||||
db PAL_PINKMON ; CLEFAIRY
|
||||
db PAL_PINKMON ; CLEFABLE
|
||||
db PAL_REDMON ; MIKON
|
||||
db PAL_REDMON ; VULPIX
|
||||
db PAL_YELLOWMON ; NINETALES
|
||||
db PAL_PINKMON ; JIGGLYPUFF
|
||||
db PAL_PINKMON ; WIGGLYTUFF
|
||||
db PAL_BLUEMON ; BITTYBAT
|
||||
db PAL_BLUEMON ; ZUBAT
|
||||
db PAL_BLUEMON ; GOLBAT
|
||||
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
|
||||
db PAL_PURPLEMON ; VENOMOTH
|
||||
db PAL_PURPLEMON ; CHEEP
|
||||
db PAL_PURPLEMON ; JABETTA
|
||||
db PAL_GREENMON ; RIBBITO
|
||||
db PAL_GREENMON ; CROAKOZUNA
|
||||
db PAL_BROWNMON ; DIGLETT
|
||||
db PAL_BROWNMON ; DUGTRIO
|
||||
db PAL_YELLOWMON ; KONYA
|
||||
db PAL_YELLOWMON ; MEOWTH
|
||||
db PAL_YELLOWMON ; PERSIAN
|
||||
db PAL_YELLOWMON ; PSYDUCK
|
||||
db PAL_GREENMON ; WEIRDUCK
|
||||
db PAL_CYANMON ; GOLDUCK
|
||||
db PAL_BROWNMON ; MANKEY
|
||||
db PAL_BROWNMON ; PRIMEAPE
|
||||
db PAL_BROWNMON ; GROWLITHE
|
||||
db PAL_REDMON ; PUDI
|
||||
db PAL_REDMON ; GROWLITHE
|
||||
db PAL_REDMON ; ARCANINE
|
||||
db PAL_BLUEMON ; POLIWAG
|
||||
db PAL_BLUEMON ; POLIWHIRL
|
||||
|
|
@ -72,40 +85,59 @@ 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
|
||||
db PAL_GREYMON ; GRAVELER
|
||||
db PAL_GREYMON ; GOLEM
|
||||
db PAL_MEWMON ; BLOTTLE
|
||||
db PAL_MEWMON ; PENDRAKEN
|
||||
db PAL_REDMON ; PUCHIKOON
|
||||
db PAL_REDMON ; PONYTA
|
||||
db PAL_REDMON ; RAPIDASH
|
||||
db PAL_PINKMON ; SLOWPOKE
|
||||
db PAL_PINKMON ; SLOWBRO
|
||||
db PAL_GREYMON ; MAGNEMITE
|
||||
db PAL_GREYMON ; MAGNETITE
|
||||
db PAL_GREYMON ; MAGNETON
|
||||
db PAL_PINKMON ; BARUNDA
|
||||
db PAL_BROWNMON ; FARFETCHD
|
||||
db PAL_BROWNMON ; MADAAMU
|
||||
db PAL_BLUEMON ; BLASTYKE
|
||||
db PAL_BLUEMON ; 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_GREYMON ; SHELLDER
|
||||
db PAL_GREYMON ; CLOYSTER
|
||||
db PAL_PURPLEMON ; SHELLDER
|
||||
db PAL_PURPLEMON ; CLOYSTER
|
||||
db PAL_PURPLEMON ; GASTLY
|
||||
db PAL_PURPLEMON ; HAUNTER
|
||||
db PAL_PURPLEMON ; GENGAR
|
||||
db PAL_GREYMON ; ONIX
|
||||
db PAL_YELLOWMON ; DROWZEE
|
||||
db PAL_YELLOWMON ; HYPNO
|
||||
db PAL_YELLOWMON ; KOTORA
|
||||
db PAL_YELLOWMON ; GAOTORA
|
||||
db PAL_YELLOWMON ; GOROTORA
|
||||
db PAL_REDMON ; KRABBY
|
||||
db PAL_REDMON ; KINGLER
|
||||
db PAL_YELLOWMON ; VOLTORB
|
||||
db PAL_YELLOWMON ; ELECTRODE
|
||||
db PAL_REDMON ; VOLTORB
|
||||
db PAL_REDMON ; ELECTRODE
|
||||
db PAL_GREENMON ; CACTUS
|
||||
db PAL_GREENMON ; CROCKY
|
||||
db PAL_BROWNMON ; DEER
|
||||
db PAL_PINKMON ; EXEGGCUTE
|
||||
db PAL_GREENMON ; EXEGGUTOR
|
||||
db PAL_GREYMON ; CUBONE
|
||||
db PAL_GREYMON ; MAROWAK
|
||||
db PAL_BROWNMON ; CUBONE
|
||||
db PAL_BROWNMON ; MAROWAK
|
||||
db PAL_BROWNMON ; GUARDIA
|
||||
db PAL_BROWNMON ; KANGASKHAN
|
||||
db PAL_BROWNMON ; HITMONLEE
|
||||
db PAL_BROWNMON ; HITMONCHAN
|
||||
db PAL_PINKMON ; LICKITUNG
|
||||
|
|
@ -114,40 +146,53 @@ MonsterPalettes:
|
|||
db PAL_GREYMON ; RHYHORN
|
||||
db PAL_GREYMON ; RHYDON
|
||||
db PAL_PINKMON ; CHANSEY
|
||||
db PAL_BLUEMON ; MONJA
|
||||
db PAL_BLUEMON ; TANGELA
|
||||
db PAL_BROWNMON ; KANGASKHAN
|
||||
db PAL_GREENMON ; DECILLA
|
||||
db PAL_GREENMON ; GYAOON
|
||||
db PAL_GREYMON ; OMEGA
|
||||
db PAL_CYANMON ; HORSEA
|
||||
db PAL_CYANMON ; SEADRA
|
||||
db PAL_REDMON ; GYOPIN
|
||||
db PAL_REDMON ; GOLDEEN
|
||||
db PAL_REDMON ; SEAKING
|
||||
db PAL_CYANMON ; SKIMPER
|
||||
db PAL_CYANMON ; BAWLIGUA
|
||||
db PAL_CYANMON ; CRYITHAN
|
||||
db PAL_REDMON ; STARYU
|
||||
db PAL_GREYMON ; STARMIE
|
||||
db PAL_PURPLEMON ; STARMIE
|
||||
db PAL_BLUEMON ; JAGG
|
||||
db PAL_PINKMON ; MR_MIME
|
||||
db PAL_GREENMON ; SCYTHER
|
||||
db PAL_MEWMON ; JYNX
|
||||
db PAL_GREENMON ; SCIZOR
|
||||
db PAL_BROWNMON ; PINSIR
|
||||
db PAL_BROWNMON ; PURAKKUSU
|
||||
db PAL_REDBAR ; JYNX
|
||||
db PAL_BLUEMON ; BUU
|
||||
db PAL_YELLOWMON ; ELECTABUZZ
|
||||
db PAL_REDMON ; MAGMAR
|
||||
db PAL_BROWNMON ; PINSIR
|
||||
db PAL_GREYMON ; TAUROS
|
||||
db PAL_GREYMON ; TRAMPEL
|
||||
db PAL_BROWNMON ; TAUROS
|
||||
db PAL_REDMON ; MAGIKARP
|
||||
db PAL_BLUEMON ; GYARADOS
|
||||
db PAL_CYANMON ; LAPRAS
|
||||
db PAL_GREYMON ; DITTO
|
||||
db PAL_GREYMON ; EEVEE
|
||||
db PAL_PURPLEMON ; DITTO
|
||||
db PAL_PURPLEMON ; ANIMON
|
||||
db PAL_BROWNMON ; EEVEE
|
||||
db PAL_CYANMON ; VAPOREON
|
||||
db PAL_YELLOWMON ; JOLTEON
|
||||
db PAL_REDMON ; FLAREON
|
||||
db PAL_GREYMON ; PORYGON
|
||||
db PAL_MEWMON ; PORYGON
|
||||
db PAL_BLUEMON ; OMANYTE
|
||||
db PAL_BLUEMON ; OMASTAR
|
||||
db PAL_BROWNMON ; KABUTO
|
||||
db PAL_BROWNMON ; KABUTOPS
|
||||
db PAL_GREYMON ; AERODACTYL
|
||||
db PAL_PINKMON ; SNORLAX
|
||||
db PAL_MEWMON ; SNORLAX
|
||||
db PAL_BLUEMON ; ARTICUNO
|
||||
db PAL_YELLOWMON ; ZAPDOS
|
||||
db PAL_REDMON ; MOLTRES
|
||||
db PAL_GREYMON ; DRATINI
|
||||
db PAL_BLUEMON ; DRATINI
|
||||
db PAL_BLUEMON ; DRAGONAIR
|
||||
db PAL_BROWNMON ; DRAGONITE
|
||||
db PAL_MEWMON ; MEWTWO
|
||||
|
|
|
|||
|
|
@ -10,8 +10,9 @@ TypeNames:
|
|||
dw .Bird
|
||||
dw .Bug
|
||||
dw .Ghost
|
||||
dw .Steel
|
||||
|
||||
REPT FIRE - GHOST - 1
|
||||
REPT FIRE - STEEL - 1
|
||||
dw .Normal
|
||||
ENDR
|
||||
|
||||
|
|
@ -22,6 +23,8 @@ ENDR
|
|||
dw .Psychic
|
||||
dw .Ice
|
||||
dw .Dragon
|
||||
dw .Dark
|
||||
dw .Fairy
|
||||
|
||||
assert_table_length NUM_TYPES
|
||||
|
||||
|
|
@ -41,3 +44,7 @@ ENDR
|
|||
.Bug: db "BUG@"
|
||||
.Ghost: db "GHOST@"
|
||||
.Dragon: db "DRAGON@"
|
||||
.Steel: db "STEEL@"
|
||||
.Fairy: db "FAIRY@"
|
||||
.Dark: db "DARK@"
|
||||
|
||||
|
|
|
|||
|
|
@ -82,4 +82,32 @@ TypeEffects:
|
|||
db GRASS, DRAGON, NOT_VERY_EFFECTIVE
|
||||
db ICE, DRAGON, SUPER_EFFECTIVE
|
||||
db DRAGON, DRAGON, SUPER_EFFECTIVE
|
||||
db DARK, PSYCHIC_TYPE, SUPER_EFFECTIVE
|
||||
db DARK, GHOST, SUPER_EFFECTIVE
|
||||
db DARK, DARK, SUPER_EFFECTIVE
|
||||
db DARK, NORMAL, NOT_VERY_EFFECTIVE
|
||||
db NORMAL, DARK, SUPER_EFFECTIVE
|
||||
db BUG, DARK, SUPER_EFFECTIVE
|
||||
db PSYCHIC_TYPE, DARK, NOT_VERY_EFFECTIVE
|
||||
db GHOST, DARK, NOT_VERY_EFFECTIVE
|
||||
db STEEL, ROCK, SUPER_EFFECTIVE
|
||||
db STEEL, WATER, NOT_VERY_EFFECTIVE
|
||||
db STEEL, ELECTRIC, NOT_VERY_EFFECTIVE
|
||||
db STEEL, STEEL, NO_EFFECT
|
||||
db WATER, STEEL, SUPER_EFFECTIVE
|
||||
db ELECTRIC, STEEL, SUPER_EFFECTIVE
|
||||
db POISON, STEEL, NOT_VERY_EFFECTIVE
|
||||
db FIGHTING, STEEL, NOT_VERY_EFFECTIVE
|
||||
db FAIRY, DRAGON, SUPER_EFFECTIVE
|
||||
db FAIRY, DARK, SUPER_EFFECTIVE
|
||||
db FAIRY, FIGHTING, SUPER_EFFECTIVE
|
||||
db FAIRY, FIRE, NOT_VERY_EFFECTIVE
|
||||
db FAIRY, POISON, NOT_VERY_EFFECTIVE
|
||||
db FAIRY, STEEL, NOT_VERY_EFFECTIVE
|
||||
db BUG, FAIRY, NOT_VERY_EFFECTIVE
|
||||
db DARK, FAIRY, NOT_VERY_EFFECTIVE
|
||||
db FIGHTING, FAIRY, NOT_VERY_EFFECTIVE
|
||||
db POISON, FAIRY, SUPER_EFFECTIVE
|
||||
db STEEL, FAIRY, SUPER_EFFECTIVE
|
||||
db DRAGON, FAIRY, NO_EFFECT
|
||||
db -1 ; end
|
||||
|
|
|
|||
|
|
@ -368,14 +368,21 @@ MainInBattleLoop:
|
|||
callfar SwitchEnemyMon
|
||||
.noLinkBattle
|
||||
ld a, [wPlayerSelectedMove]
|
||||
cp BULLET_PUNCH
|
||||
jr z, .PriorityMoveUsed
|
||||
cp QUICK_ATTACK
|
||||
jr nz, .playerDidNotUseQuickAttack
|
||||
.PriorityMoveUsed
|
||||
ld a, [wEnemySelectedMove]
|
||||
cp BULLET_PUNCH
|
||||
jr z, .compareSpeed
|
||||
cp QUICK_ATTACK
|
||||
jr z, .compareSpeed ; if both used Quick Attack
|
||||
jp .playerMovesFirst ; if player used Quick Attack and enemy didn't
|
||||
.playerDidNotUseQuickAttack
|
||||
ld a, [wEnemySelectedMove]
|
||||
cp BULLET_PUNCH
|
||||
jr z, .enemyMovesFirst
|
||||
cp QUICK_ATTACK
|
||||
jr z, .enemyMovesFirst ; if enemy used Quick Attack and player didn't
|
||||
ld a, [wPlayerSelectedMove]
|
||||
|
|
@ -5150,7 +5157,7 @@ MetronomePickMove:
|
|||
and a
|
||||
jr z, .pickMoveLoop
|
||||
cp STRUGGLE
|
||||
assert NUM_ATTACKS == STRUGGLE ; random numbers greater than STRUGGLE are not moves
|
||||
assert NUM_ATTACKS == BULLET_PUNCH ; rerolls if greater than the last move in index
|
||||
jr nc, .pickMoveLoop
|
||||
cp METRONOME
|
||||
jr z, .pickMoveLoop
|
||||
|
|
|
|||
Loading…
Reference in a new issue