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