Adding move data, types, and some Pokemon data

This commit is contained in:
MementoMartha 2022-08-31 10:17:48 +01:00
parent cdcd29b503
commit ac45c8b5bc
14 changed files with 383 additions and 107 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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@"

View file

@ -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