pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Add suffixes to some constants to avoid ambiguity

Browse Source 
- `PSYCHIC` → `PSYCHIC_TYPE` (not the trainer `PSYCHIC_T` or the move `PSYCHIC_M`)
- `BLACKBELT` → `BLACKBELT_I` (not the trainer `BLACKBELT_T`)
- `CURSE_T` → `CURSE_TYPE` (not the move `CURSE`)
- `TOWN_MAP_D` → `TOWN_MAP_POSTER` (not the item `TOWN_MAP`)

This also uncovered a misidentified event: `EVENT_DECO_PLANT_4` → `EVENT_DECO_POSTER_1`. (There are three plants and four posters.)
This commit is contained in:
Rangi 2020-03-21 17:50:44 -04:00
parent adbe7f995c
commit 0345e4fb0e
40 changed files with 487 additions and 487 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/deco_constants.asm
View File

@ -13,7 +13,7 @@ const_value = 1
const MAGNAPLANT const MAGNAPLANT
const TROPICPLANT const TROPICPLANT
const JUMBOPLANT const JUMBOPLANT
const TOWN_MAP_D const TOWN_MAP_POSTER
const FAMICOM const FAMICOM
const SUPER_NES const SUPER_NES
const NINTENDO_64 const NINTENDO_64

6
constants/event_flags.asm
View File

@ -701,10 +701,10 @@
const EVENT_DECO_PLANT_1 const EVENT_DECO_PLANT_1
const EVENT_DECO_PLANT_2 const EVENT_DECO_PLANT_2
const EVENT_DECO_PLANT_3 const EVENT_DECO_PLANT_3
const EVENT_DECO_PLANT_4 const EVENT_DECO_POSTER_1
const EVENT_DECO_POSTER_1 ; 2b0 const EVENT_DECO_POSTER_2 ; 2b0
const EVENT_DECO_POSTER_2
const EVENT_DECO_POSTER_3 const EVENT_DECO_POSTER_3
const EVENT_DECO_POSTER_4
const EVENT_DECO_FAMICOM const EVENT_DECO_FAMICOM
const EVENT_DECO_SNES const EVENT_DECO_SNES
const EVENT_DECO_N64 const EVENT_DECO_N64

2
constants/item_constants.asm
View File

@ -103,7 +103,7 @@
const MYSTIC_WATER ; 5f const MYSTIC_WATER ; 5f
const TWISTEDSPOON ; 60 const TWISTEDSPOON ; 60
const WHT_APRICORN ; 61 const WHT_APRICORN ; 61
const BLACKBELT ; 62 const BLACKBELT_I ; 62
const BLK_APRICORN ; 63 const BLK_APRICORN ; 63
const ITEM_64 ; 64 const ITEM_64 ; 64
const PNK_APRICORN ; 65 const PNK_APRICORN ; 65

4
constants/type_constants.asm
View File

@ -28,7 +28,7 @@ UNUSED_TYPES EQU const_value
const TYPE_16 const TYPE_16
const TYPE_17 const TYPE_17
const TYPE_18 const TYPE_18
const CURSE_T const CURSE_TYPE
UNUSED_TYPES_END EQU const_value UNUSED_TYPES_END EQU const_value
SPECIAL EQU const_value SPECIAL EQU const_value
@ -36,7 +36,7 @@ SPECIAL EQU const_value
const WATER const WATER
const GRASS const GRASS
const ELECTRIC const ELECTRIC
const PSYCHIC const PSYCHIC_TYPE
const ICE const ICE
const DRAGON const DRAGON
const DARK const DARK

106
data/decorations/attributes.asm
View File

@ -7,56 +7,56 @@ ENDM
DecorationAttributes: DecorationAttributes:
; entries correspond to deco constants ; entries correspond to deco constants
decoration DECO_PLANT, $00, $0, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_PLANT, 0, 0, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, 0
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BED, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BED, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, 0
decoration DECO_BED, FEATHERY_BED, SET_UP_BED, EVENT_DECO_BED_1, $1b decoration DECO_BED, FEATHERY_BED, SET_UP_BED, EVENT_DECO_BED_1, $1b
decoration DECO_BED, PINK_BED, SET_UP_BED, EVENT_DECO_BED_2, $1c decoration DECO_BED, PINK_BED, SET_UP_BED, EVENT_DECO_BED_2, $1c
decoration DECO_BED, POLKADOT_BED, SET_UP_BED, EVENT_DECO_BED_3, $1d decoration DECO_BED, POLKADOT_BED, SET_UP_BED, EVENT_DECO_BED_3, $1d
decoration DECO_BED, PIKACHU_BED, SET_UP_BED, EVENT_DECO_BED_4, $1e decoration DECO_BED, PIKACHU_BED, SET_UP_BED, EVENT_DECO_BED_4, $1e
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CARPET, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CARPET, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, 0
decoration DECO_CARPET, RED_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_1, $08 decoration DECO_CARPET, RED_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_1, $08
decoration DECO_CARPET, BLUE_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_2, $0b decoration DECO_CARPET, BLUE_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_2, $0b
decoration DECO_CARPET, YELLOW_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_3, $0e decoration DECO_CARPET, YELLOW_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_3, $0e
decoration DECO_CARPET, GREEN_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_4, $11 decoration DECO_CARPET, GREEN_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_4, $11
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_PLANT, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_PLANT, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, 0
decoration DECO_PLANT, MAGNAPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_1, $20 decoration DECO_PLANT, MAGNAPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_1, $20
decoration DECO_PLANT, TROPICPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_2, $21 decoration DECO_PLANT, TROPICPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_2, $21
decoration DECO_PLANT, JUMBOPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_3, $22 decoration DECO_PLANT, JUMBOPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_3, $22
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_POSTER, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_POSTER, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, 0
decoration DECO_PLANT, TOWN_MAP_D, SET_UP_POSTER, EVENT_DECO_PLANT_4, $1f decoration DECO_PLANT, TOWN_MAP_POSTER, SET_UP_POSTER, EVENT_DECO_POSTER_1, $1f
decoration DECO_POSTER, PIKACHU, SET_UP_POSTER, EVENT_DECO_POSTER_1, $23 decoration DECO_POSTER, PIKACHU, SET_UP_POSTER, EVENT_DECO_POSTER_2, $23
decoration DECO_POSTER, CLEFAIRY, SET_UP_POSTER, EVENT_DECO_POSTER_2, $24 decoration DECO_POSTER, CLEFAIRY, SET_UP_POSTER, EVENT_DECO_POSTER_3, $24
decoration DECO_POSTER, JIGGLYPUFF, SET_UP_POSTER, EVENT_DECO_POSTER_3, $25 decoration DECO_POSTER, JIGGLYPUFF, SET_UP_POSTER, EVENT_DECO_POSTER_4, $25
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CONSOLE, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CONSOLE, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, 0
decoration DECO_PLANT, FAMICOM, SET_UP_CONSOLE, EVENT_DECO_FAMICOM, SPRITE_FAMICOM decoration DECO_PLANT, FAMICOM, SET_UP_CONSOLE, EVENT_DECO_FAMICOM, SPRITE_FAMICOM
decoration DECO_PLANT, SUPER_NES, SET_UP_CONSOLE, EVENT_DECO_SNES, SPRITE_SNES decoration DECO_PLANT, SUPER_NES, SET_UP_CONSOLE, EVENT_DECO_SNES, SPRITE_SNES
decoration DECO_PLANT, NINTENDO_64, SET_UP_CONSOLE, EVENT_DECO_N64, SPRITE_N64 decoration DECO_PLANT, NINTENDO_64, SET_UP_CONSOLE, EVENT_DECO_N64, SPRITE_N64
decoration DECO_PLANT, VIRTUAL_BOY, SET_UP_CONSOLE, EVENT_DECO_VIRTUAL_BOY, SPRITE_VIRTUAL_BOY decoration DECO_PLANT, VIRTUAL_BOY, SET_UP_CONSOLE, EVENT_DECO_VIRTUAL_BOY, SPRITE_VIRTUAL_BOY
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BIG_DOLL, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BIG_DOLL, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, 0
decoration DECO_BIGDOLL, SNORLAX, SET_UP_BIG_DOLL, EVENT_DECO_BIG_SNORLAX_DOLL, SPRITE_BIG_SNORLAX decoration DECO_BIGDOLL, SNORLAX, SET_UP_BIG_DOLL, EVENT_DECO_BIG_SNORLAX_DOLL, SPRITE_BIG_SNORLAX
decoration DECO_BIGDOLL, ONIX, SET_UP_BIG_DOLL, EVENT_DECO_BIG_ONIX_DOLL, SPRITE_BIG_ONIX decoration DECO_BIGDOLL, ONIX, SET_UP_BIG_DOLL, EVENT_DECO_BIG_ONIX_DOLL, SPRITE_BIG_ONIX
decoration DECO_BIGDOLL, LAPRAS, SET_UP_BIG_DOLL, EVENT_DECO_BIG_LAPRAS_DOLL, SPRITE_BIG_LAPRAS decoration DECO_BIGDOLL, LAPRAS, SET_UP_BIG_DOLL, EVENT_DECO_BIG_LAPRAS_DOLL, SPRITE_BIG_LAPRAS
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_DOLL, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_DOLL, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, 0
decoration DECO_DOLL, PIKACHU, SET_UP_DOLL, EVENT_DECO_PIKACHU_DOLL, SPRITE_PIKACHU decoration DECO_DOLL, PIKACHU, SET_UP_DOLL, EVENT_DECO_PIKACHU_DOLL, SPRITE_PIKACHU
decoration DECO_PLANT, SURF_PIKA_DOLL, SET_UP_DOLL, EVENT_DECO_SURFING_PIKACHU_DOLL, SPRITE_SURFING_PIKACHU decoration DECO_PLANT, SURF_PIKA_DOLL, SET_UP_DOLL, EVENT_DECO_SURFING_PIKACHU_DOLL, SPRITE_SURFING_PIKACHU
decoration DECO_DOLL, CLEFAIRY, SET_UP_DOLL, EVENT_DECO_CLEFAIRY_DOLL, SPRITE_CLEFAIRY decoration DECO_DOLL, CLEFAIRY, SET_UP_DOLL, EVENT_DECO_CLEFAIRY_DOLL, SPRITE_CLEFAIRY
decoration DECO_DOLL, JIGGLYPUFF, SET_UP_DOLL, EVENT_DECO_JIGGLYPUFF_DOLL, SPRITE_JIGGLYPUFF decoration DECO_DOLL, JIGGLYPUFF, SET_UP_DOLL, EVENT_DECO_JIGGLYPUFF_DOLL, SPRITE_JIGGLYPUFF
decoration DECO_DOLL, BULBASAUR, SET_UP_DOLL, EVENT_DECO_BULBASAUR_DOLL, SPRITE_BULBASAUR decoration DECO_DOLL, BULBASAUR, SET_UP_DOLL, EVENT_DECO_BULBASAUR_DOLL, SPRITE_BULBASAUR
decoration DECO_DOLL, CHARMANDER, SET_UP_DOLL, EVENT_DECO_CHARMANDER_DOLL, SPRITE_CHARMANDER decoration DECO_DOLL, CHARMANDER, SET_UP_DOLL, EVENT_DECO_CHARMANDER_DOLL, SPRITE_CHARMANDER
decoration DECO_DOLL, SQUIRTLE, SET_UP_DOLL, EVENT_DECO_SQUIRTLE_DOLL, SPRITE_SQUIRTLE decoration DECO_DOLL, SQUIRTLE, SET_UP_DOLL, EVENT_DECO_SQUIRTLE_DOLL, SPRITE_SQUIRTLE
decoration DECO_DOLL, POLIWAG, SET_UP_DOLL, EVENT_DECO_POLIWAG_DOLL, SPRITE_POLIWAG decoration DECO_DOLL, POLIWAG, SET_UP_DOLL, EVENT_DECO_POLIWAG_DOLL, SPRITE_POLIWAG
decoration DECO_DOLL, DIGLETT, SET_UP_DOLL, EVENT_DECO_DIGLETT_DOLL, SPRITE_DIGLETT decoration DECO_DOLL, DIGLETT, SET_UP_DOLL, EVENT_DECO_DIGLETT_DOLL, SPRITE_DIGLETT
decoration DECO_DOLL, STARYU, SET_UP_DOLL, EVENT_DECO_STARMIE_DOLL, SPRITE_STARMIE decoration DECO_DOLL, STARYU, SET_UP_DOLL, EVENT_DECO_STARMIE_DOLL, SPRITE_STARMIE
decoration DECO_DOLL, MAGIKARP, SET_UP_DOLL, EVENT_DECO_MAGIKARP_DOLL, SPRITE_MAGIKARP decoration DECO_DOLL, MAGIKARP, SET_UP_DOLL, EVENT_DECO_MAGIKARP_DOLL, SPRITE_MAGIKARP
decoration DECO_DOLL, ODDISH, SET_UP_DOLL, EVENT_DECO_ODDISH_DOLL, SPRITE_ODDISH decoration DECO_DOLL, ODDISH, SET_UP_DOLL, EVENT_DECO_ODDISH_DOLL, SPRITE_ODDISH
decoration DECO_DOLL, GENGAR, SET_UP_DOLL, EVENT_DECO_GENGAR_DOLL, SPRITE_GENGAR decoration DECO_DOLL, GENGAR, SET_UP_DOLL, EVENT_DECO_GENGAR_DOLL, SPRITE_GENGAR
decoration DECO_DOLL, SHELLDER, SET_UP_DOLL, EVENT_DECO_SHELLDER_DOLL, SPRITE_SHELLDER decoration DECO_DOLL, SHELLDER, SET_UP_DOLL, EVENT_DECO_SHELLDER_DOLL, SPRITE_SHELLDER
decoration DECO_DOLL, GRIMER, SET_UP_DOLL, EVENT_DECO_GRIMER_DOLL, SPRITE_GRIMER decoration DECO_DOLL, GRIMER, SET_UP_DOLL, EVENT_DECO_GRIMER_DOLL, SPRITE_GRIMER
decoration DECO_DOLL, VOLTORB, SET_UP_DOLL, EVENT_DECO_VOLTORB_DOLL, SPRITE_VOLTORB decoration DECO_DOLL, VOLTORB, SET_UP_DOLL, EVENT_DECO_VOLTORB_DOLL, SPRITE_VOLTORB
decoration DECO_DOLL, WEEDLE, SET_UP_DOLL, EVENT_DECO_WEEDLE_DOLL, SPRITE_WEEDLE decoration DECO_DOLL, WEEDLE, SET_UP_DOLL, EVENT_DECO_WEEDLE_DOLL, SPRITE_WEEDLE
decoration DECO_DOLL, UNOWN, SET_UP_DOLL, EVENT_DECO_UNOWN_DOLL, SPRITE_UNOWN decoration DECO_DOLL, UNOWN, SET_UP_DOLL, EVENT_DECO_UNOWN_DOLL, SPRITE_UNOWN
decoration DECO_DOLL, GEODUDE, SET_UP_DOLL, EVENT_DECO_GEODUDE_DOLL, SPRITE_GEODUDE decoration DECO_DOLL, GEODUDE, SET_UP_DOLL, EVENT_DECO_GEODUDE_DOLL, SPRITE_GEODUDE
decoration DECO_DOLL, MACHOP, SET_UP_DOLL, EVENT_DECO_MACHOP_DOLL, SPRITE_MACHOP decoration DECO_DOLL, MACHOP, SET_UP_DOLL, EVENT_DECO_MACHOP_DOLL, SPRITE_MACHOP
decoration DECO_DOLL, TENTACOOL, SET_UP_DOLL, EVENT_DECO_TENTACOOL_DOLL, SPRITE_TENTACOOL decoration DECO_DOLL, TENTACOOL, SET_UP_DOLL, EVENT_DECO_TENTACOOL_DOLL, SPRITE_TENTACOOL
decoration DECO_PLANT, GOLD_TROPHY, SET_UP_DOLL, EVENT_DECO_GOLD_TROPHY, SPRITE_GOLD_TROPHY decoration DECO_PLANT, GOLD_TROPHY, SET_UP_DOLL, EVENT_DECO_GOLD_TROPHY, SPRITE_GOLD_TROPHY
decoration DECO_PLANT, SILVER_TROPHY, SET_UP_DOLL, EVENT_DECO_SILVER_TROPHY, SPRITE_SILVER_TROPHY decoration DECO_PLANT, SILVER_TROPHY, SET_UP_DOLL, EVENT_DECO_SILVER_TROPHY, SPRITE_SILVER_TROPHY

2
data/items/attributes.asm
View File

@ -201,7 +201,7 @@ ItemAttributes:
item_attribute 100, HELD_PSYCHIC_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE item_attribute 100, HELD_PSYCHIC_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; WHT_APRICORN ; WHT_APRICORN
item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BLACKBELT ; BLACKBELT_I
item_attribute 100, HELD_FIGHTING_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE item_attribute 100, HELD_FIGHTING_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BLK_APRICORN ; BLK_APRICORN
item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE

502
data/moves/moves.asm
View File

@ -12,254 +12,254 @@ ENDM
Moves: Moves:
; entries correspond to constants/move_constants.asm ; entries correspond to constants/move_constants.asm
move POUND, EFFECT_NORMAL_HIT, 40, NORMAL, 100, 35, 0 move POUND, EFFECT_NORMAL_HIT, 40, NORMAL, 100, 35, 0
move KARATE_CHOP, EFFECT_NORMAL_HIT, 50, FIGHTING, 100, 25, 0 move KARATE_CHOP, EFFECT_NORMAL_HIT, 50, FIGHTING, 100, 25, 0
move DOUBLESLAP, EFFECT_MULTI_HIT, 15, NORMAL, 85, 10, 0 move DOUBLESLAP, EFFECT_MULTI_HIT, 15, NORMAL, 85, 10, 0
move COMET_PUNCH, EFFECT_MULTI_HIT, 18, NORMAL, 85, 15, 0 move COMET_PUNCH, EFFECT_MULTI_HIT, 18, NORMAL, 85, 15, 0
move MEGA_PUNCH, EFFECT_NORMAL_HIT, 80, NORMAL, 85, 20, 0 move MEGA_PUNCH, EFFECT_NORMAL_HIT, 80, NORMAL, 85, 20, 0
move PAY_DAY, EFFECT_PAY_DAY, 40, NORMAL, 100, 20, 0 move PAY_DAY, EFFECT_PAY_DAY, 40, NORMAL, 100, 20, 0
move FIRE_PUNCH, EFFECT_BURN_HIT, 75, FIRE, 100, 15, 10 move FIRE_PUNCH, EFFECT_BURN_HIT, 75, FIRE, 100, 15, 10
move ICE_PUNCH, EFFECT_FREEZE_HIT, 75, ICE, 100, 15, 10 move ICE_PUNCH, EFFECT_FREEZE_HIT, 75, ICE, 100, 15, 10
move THUNDERPUNCH, EFFECT_PARALYZE_HIT, 75, ELECTRIC, 100, 15, 10 move THUNDERPUNCH, EFFECT_PARALYZE_HIT, 75, ELECTRIC, 100, 15, 10
move SCRATCH, EFFECT_NORMAL_HIT, 40, NORMAL, 100, 35, 0 move SCRATCH, EFFECT_NORMAL_HIT, 40, NORMAL, 100, 35, 0
move VICEGRIP, EFFECT_NORMAL_HIT, 55, NORMAL, 100, 30, 0 move VICEGRIP, EFFECT_NORMAL_HIT, 55, NORMAL, 100, 30, 0
move GUILLOTINE, EFFECT_OHKO, 0, NORMAL, 30, 5, 0 move GUILLOTINE, EFFECT_OHKO, 0, NORMAL, 30, 5, 0
move RAZOR_WIND, EFFECT_RAZOR_WIND, 80, NORMAL, 75, 10, 0 move RAZOR_WIND, EFFECT_RAZOR_WIND, 80, NORMAL, 75, 10, 0
move SWORDS_DANCE, EFFECT_ATTACK_UP_2, 0, NORMAL, 100, 30, 0 move SWORDS_DANCE, EFFECT_ATTACK_UP_2, 0, NORMAL, 100, 30, 0
move CUT, EFFECT_NORMAL_HIT, 50, NORMAL, 95, 30, 0 move CUT, EFFECT_NORMAL_HIT, 50, NORMAL, 95, 30, 0
move GUST, EFFECT_GUST, 40, FLYING, 100, 35, 0 move GUST, EFFECT_GUST, 40, FLYING, 100, 35, 0
move WING_ATTACK, EFFECT_NORMAL_HIT, 60, FLYING, 100, 35, 0 move WING_ATTACK, EFFECT_NORMAL_HIT, 60, FLYING, 100, 35, 0
move WHIRLWIND, EFFECT_FORCE_SWITCH, 0, NORMAL, 100, 20, 0 move WHIRLWIND, EFFECT_FORCE_SWITCH, 0, NORMAL, 100, 20, 0
move FLY, EFFECT_FLY, 70, FLYING, 95, 15, 0 move FLY, EFFECT_FLY, 70, FLYING, 95, 15, 0
move BIND, EFFECT_TRAP_TARGET, 15, NORMAL, 75, 20, 0 move BIND, EFFECT_TRAP_TARGET, 15, NORMAL, 75, 20, 0
move SLAM, EFFECT_NORMAL_HIT, 80, NORMAL, 75, 20, 0 move SLAM, EFFECT_NORMAL_HIT, 80, NORMAL, 75, 20, 0
move VINE_WHIP, EFFECT_NORMAL_HIT, 35, GRASS, 100, 10, 0 move VINE_WHIP, EFFECT_NORMAL_HIT, 35, GRASS, 100, 10, 0
move STOMP, EFFECT_STOMP, 65, NORMAL, 100, 20, 30 move STOMP, EFFECT_STOMP, 65, NORMAL, 100, 20, 30
move DOUBLE_KICK, EFFECT_DOUBLE_HIT, 30, FIGHTING, 100, 30, 0 move DOUBLE_KICK, EFFECT_DOUBLE_HIT, 30, FIGHTING, 100, 30, 0
move MEGA_KICK, EFFECT_NORMAL_HIT, 120, NORMAL, 75, 5, 0 move MEGA_KICK, EFFECT_NORMAL_HIT, 120, NORMAL, 75, 5, 0
move JUMP_KICK, EFFECT_JUMP_KICK, 70, FIGHTING, 95, 25, 0 move JUMP_KICK, EFFECT_JUMP_KICK, 70, FIGHTING, 95, 25, 0
move ROLLING_KICK, EFFECT_FLINCH_HIT, 60, FIGHTING, 85, 15, 30 move ROLLING_KICK, EFFECT_FLINCH_HIT, 60, FIGHTING, 85, 15, 30
move SAND_ATTACK, EFFECT_ACCURACY_DOWN, 0, GROUND, 100, 15, 0 move SAND_ATTACK, EFFECT_ACCURACY_DOWN, 0, GROUND, 100, 15, 0
move HEADBUTT, EFFECT_FLINCH_HIT, 70, NORMAL, 100, 15, 30 move HEADBUTT, EFFECT_FLINCH_HIT, 70, NORMAL, 100, 15, 30
move HORN_ATTACK, EFFECT_NORMAL_HIT, 65, NORMAL, 100, 25, 0 move HORN_ATTACK, EFFECT_NORMAL_HIT, 65, NORMAL, 100, 25, 0
move FURY_ATTACK, EFFECT_MULTI_HIT, 15, NORMAL, 85, 20, 0 move FURY_ATTACK, EFFECT_MULTI_HIT, 15, NORMAL, 85, 20, 0
move HORN_DRILL, EFFECT_OHKO, 1, NORMAL, 30, 5, 0 move HORN_DRILL, EFFECT_OHKO, 1, NORMAL, 30, 5, 0
move TACKLE, EFFECT_NORMAL_HIT, 35, NORMAL, 95, 35, 0 move TACKLE, EFFECT_NORMAL_HIT, 35, NORMAL, 95, 35, 0
move BODY_SLAM, EFFECT_PARALYZE_HIT, 85, NORMAL, 100, 15, 30 move BODY_SLAM, EFFECT_PARALYZE_HIT, 85, NORMAL, 100, 15, 30
move WRAP, EFFECT_TRAP_TARGET, 15, NORMAL, 85, 20, 0 move WRAP, EFFECT_TRAP_TARGET, 15, NORMAL, 85, 20, 0
move TAKE_DOWN, EFFECT_RECOIL_HIT, 90, NORMAL, 85, 20, 0 move TAKE_DOWN, EFFECT_RECOIL_HIT, 90, NORMAL, 85, 20, 0
move THRASH, EFFECT_RAMPAGE, 90, NORMAL, 100, 20, 0 move THRASH, EFFECT_RAMPAGE, 90, NORMAL, 100, 20, 0
move DOUBLE_EDGE, EFFECT_RECOIL_HIT, 120, NORMAL, 100, 15, 0 move DOUBLE_EDGE, EFFECT_RECOIL_HIT, 120, NORMAL, 100, 15, 0
move TAIL_WHIP, EFFECT_DEFENSE_DOWN, 0, NORMAL, 100, 30, 0 move TAIL_WHIP, EFFECT_DEFENSE_DOWN, 0, NORMAL, 100, 30, 0
move POISON_STING, EFFECT_POISON_HIT, 15, POISON, 100, 35, 30 move POISON_STING, EFFECT_POISON_HIT, 15, POISON, 100, 35, 30
move TWINEEDLE, EFFECT_POISON_MULTI_HIT, 25, BUG, 100, 20, 20 move TWINEEDLE, EFFECT_POISON_MULTI_HIT, 25, BUG, 100, 20, 20
move PIN_MISSILE, EFFECT_MULTI_HIT, 14, BUG, 85, 20, 0 move PIN_MISSILE, EFFECT_MULTI_HIT, 14, BUG, 85, 20, 0
move LEER, EFFECT_DEFENSE_DOWN, 0, NORMAL, 100, 30, 0 move LEER, EFFECT_DEFENSE_DOWN, 0, NORMAL, 100, 30, 0
move BITE, EFFECT_FLINCH_HIT, 60, DARK, 100, 25, 30 move BITE, EFFECT_FLINCH_HIT, 60, DARK, 100, 25, 30
move GROWL, EFFECT_ATTACK_DOWN, 0, NORMAL, 100, 40, 0 move GROWL, EFFECT_ATTACK_DOWN, 0, NORMAL, 100, 40, 0
move ROAR, EFFECT_FORCE_SWITCH, 0, NORMAL, 100, 20, 0 move ROAR, EFFECT_FORCE_SWITCH, 0, NORMAL, 100, 20, 0
move SING, EFFECT_SLEEP, 0, NORMAL, 55, 15, 0 move SING, EFFECT_SLEEP, 0, NORMAL, 55, 15, 0
move SUPERSONIC, EFFECT_CONFUSE, 0, NORMAL, 55, 20, 0 move SUPERSONIC, EFFECT_CONFUSE, 0, NORMAL, 55, 20, 0
move SONICBOOM, EFFECT_STATIC_DAMAGE, 20, NORMAL, 90, 20, 0 move SONICBOOM, EFFECT_STATIC_DAMAGE, 20, NORMAL, 90, 20, 0
move DISABLE, EFFECT_DISABLE, 0, NORMAL, 55, 20, 0 move DISABLE, EFFECT_DISABLE, 0, NORMAL, 55, 20, 0
move ACID, EFFECT_DEFENSE_DOWN_HIT, 40, POISON, 100, 30, 10 move ACID, EFFECT_DEFENSE_DOWN_HIT, 40, POISON, 100, 30, 10
move EMBER, EFFECT_BURN_HIT, 40, FIRE, 100, 25, 10 move EMBER, EFFECT_BURN_HIT, 40, FIRE, 100, 25, 10
move FLAMETHROWER, EFFECT_BURN_HIT, 95, FIRE, 100, 15, 10 move FLAMETHROWER, EFFECT_BURN_HIT, 95, FIRE, 100, 15, 10
move MIST, EFFECT_MIST, 0, ICE, 100, 30, 0 move MIST, EFFECT_MIST, 0, ICE, 100, 30, 0
move WATER_GUN, EFFECT_NORMAL_HIT, 40, WATER, 100, 25, 0 move WATER_GUN, EFFECT_NORMAL_HIT, 40, WATER, 100, 25, 0
move HYDRO_PUMP, EFFECT_NORMAL_HIT, 120, WATER, 80, 5, 0 move HYDRO_PUMP, EFFECT_NORMAL_HIT, 120, WATER, 80, 5, 0
move SURF, EFFECT_NORMAL_HIT, 95, WATER, 100, 15, 0 move SURF, EFFECT_NORMAL_HIT, 95, WATER, 100, 15, 0
move ICE_BEAM, EFFECT_FREEZE_HIT, 95, ICE, 100, 10, 10 move ICE_BEAM, EFFECT_FREEZE_HIT, 95, ICE, 100, 10, 10
move BLIZZARD, EFFECT_FREEZE_HIT, 120, ICE, 70, 5, 10 move BLIZZARD, EFFECT_FREEZE_HIT, 120, ICE, 70, 5, 10
move PSYBEAM, EFFECT_CONFUSE_HIT, 65, PSYCHIC, 100, 20, 10 move PSYBEAM, EFFECT_CONFUSE_HIT, 65, PSYCHIC_TYPE, 100, 20, 10
move BUBBLEBEAM, EFFECT_SPEED_DOWN_HIT, 65, WATER, 100, 20, 10 move BUBBLEBEAM, EFFECT_SPEED_DOWN_HIT, 65, WATER, 100, 20, 10
move AURORA_BEAM, EFFECT_ATTACK_DOWN_HIT, 65, ICE, 100, 20, 10 move AURORA_BEAM, EFFECT_ATTACK_DOWN_HIT, 65, ICE, 100, 20, 10
move HYPER_BEAM, EFFECT_HYPER_BEAM, 150, NORMAL, 90, 5, 0 move HYPER_BEAM, EFFECT_HYPER_BEAM, 150, NORMAL, 90, 5, 0
move PECK, EFFECT_NORMAL_HIT, 35, FLYING, 100, 35, 0 move PECK, EFFECT_NORMAL_HIT, 35, FLYING, 100, 35, 0
move DRILL_PECK, EFFECT_NORMAL_HIT, 80, FLYING, 100, 20, 0 move DRILL_PECK, EFFECT_NORMAL_HIT, 80, FLYING, 100, 20, 0
move SUBMISSION, EFFECT_RECOIL_HIT, 80, FIGHTING, 80, 25, 0 move SUBMISSION, EFFECT_RECOIL_HIT, 80, FIGHTING, 80, 25, 0
move LOW_KICK, EFFECT_FLINCH_HIT, 50, FIGHTING, 90, 20, 30 move LOW_KICK, EFFECT_FLINCH_HIT, 50, FIGHTING, 90, 20, 30
move COUNTER, EFFECT_COUNTER, 1, FIGHTING, 100, 20, 0 move COUNTER, EFFECT_COUNTER, 1, FIGHTING, 100, 20, 0
move SEISMIC_TOSS, EFFECT_LEVEL_DAMAGE, 1, FIGHTING, 100, 20, 0 move SEISMIC_TOSS, EFFECT_LEVEL_DAMAGE, 1, FIGHTING, 100, 20, 0
move STRENGTH, EFFECT_NORMAL_HIT, 80, NORMAL, 100, 15, 0 move STRENGTH, EFFECT_NORMAL_HIT, 80, NORMAL, 100, 15, 0
move ABSORB, EFFECT_LEECH_HIT, 20, GRASS, 100, 20, 0 move ABSORB, EFFECT_LEECH_HIT, 20, GRASS, 100, 20, 0
move MEGA_DRAIN, EFFECT_LEECH_HIT, 40, GRASS, 100, 10, 0 move MEGA_DRAIN, EFFECT_LEECH_HIT, 40, GRASS, 100, 10, 0
move LEECH_SEED, EFFECT_LEECH_SEED, 0, GRASS, 90, 10, 0 move LEECH_SEED, EFFECT_LEECH_SEED, 0, GRASS, 90, 10, 0
move GROWTH, EFFECT_SP_ATK_UP, 0, NORMAL, 100, 40, 0 move GROWTH, EFFECT_SP_ATK_UP, 0, NORMAL, 100, 40, 0
move RAZOR_LEAF, EFFECT_NORMAL_HIT, 55, GRASS, 95, 25, 0 move RAZOR_LEAF, EFFECT_NORMAL_HIT, 55, GRASS, 95, 25, 0
move SOLARBEAM, EFFECT_SOLARBEAM, 120, GRASS, 100, 10, 0 move SOLARBEAM, EFFECT_SOLARBEAM, 120, GRASS, 100, 10, 0
move POISONPOWDER, EFFECT_POISON, 0, POISON, 75, 35, 0 move POISONPOWDER, EFFECT_POISON, 0, POISON, 75, 35, 0
move STUN_SPORE, EFFECT_PARALYZE, 0, GRASS, 75, 30, 0 move STUN_SPORE, EFFECT_PARALYZE, 0, GRASS, 75, 30, 0
move SLEEP_POWDER, EFFECT_SLEEP, 0, GRASS, 75, 15, 0 move SLEEP_POWDER, EFFECT_SLEEP, 0, GRASS, 75, 15, 0
move PETAL_DANCE, EFFECT_RAMPAGE, 70, GRASS, 100, 20, 0 move PETAL_DANCE, EFFECT_RAMPAGE, 70, GRASS, 100, 20, 0
move STRING_SHOT, EFFECT_SPEED_DOWN, 0, BUG, 95, 40, 0 move STRING_SHOT, EFFECT_SPEED_DOWN, 0, BUG, 95, 40, 0
move DRAGON_RAGE, EFFECT_STATIC_DAMAGE, 40, DRAGON, 100, 10, 0 move DRAGON_RAGE, EFFECT_STATIC_DAMAGE, 40, DRAGON, 100, 10, 0
move FIRE_SPIN, EFFECT_TRAP_TARGET, 15, FIRE, 70, 15, 0 move FIRE_SPIN, EFFECT_TRAP_TARGET, 15, FIRE, 70, 15, 0
move THUNDERSHOCK, EFFECT_PARALYZE_HIT, 40, ELECTRIC, 100, 30, 10 move THUNDERSHOCK, EFFECT_PARALYZE_HIT, 40, ELECTRIC, 100, 30, 10
move THUNDERBOLT, EFFECT_PARALYZE_HIT, 95, ELECTRIC, 100, 15, 10 move THUNDERBOLT, EFFECT_PARALYZE_HIT, 95, ELECTRIC, 100, 15, 10
move THUNDER_WAVE, EFFECT_PARALYZE, 0, ELECTRIC, 100, 20, 0 move THUNDER_WAVE, EFFECT_PARALYZE, 0, ELECTRIC, 100, 20, 0
move THUNDER, EFFECT_THUNDER, 120, ELECTRIC, 70, 10, 30 move THUNDER, EFFECT_THUNDER, 120, ELECTRIC, 70, 10, 30
move ROCK_THROW, EFFECT_NORMAL_HIT, 50, ROCK, 90, 15, 0 move ROCK_THROW, EFFECT_NORMAL_HIT, 50, ROCK, 90, 15, 0
move EARTHQUAKE, EFFECT_EARTHQUAKE, 100, GROUND, 100, 10, 0 move EARTHQUAKE, EFFECT_EARTHQUAKE, 100, GROUND, 100, 10, 0
move FISSURE, EFFECT_OHKO, 1, GROUND, 30, 5, 0 move FISSURE, EFFECT_OHKO, 1, GROUND, 30, 5, 0
move DIG, EFFECT_FLY, 60, GROUND, 100, 10, 0 move DIG, EFFECT_FLY, 60, GROUND, 100, 10, 0
move TOXIC, EFFECT_TOXIC, 0, POISON, 85, 10, 0 move TOXIC, EFFECT_TOXIC, 0, POISON, 85, 10, 0
move CONFUSION, EFFECT_CONFUSE_HIT, 50, PSYCHIC, 100, 25, 10 move CONFUSION, EFFECT_CONFUSE_HIT, 50, PSYCHIC_TYPE, 100, 25, 10
move PSYCHIC_M, EFFECT_SP_DEF_DOWN_HIT, 90, PSYCHIC, 100, 10, 10 move PSYCHIC_M, EFFECT_SP_DEF_DOWN_HIT, 90, PSYCHIC_TYPE, 100, 10, 10
move HYPNOSIS, EFFECT_SLEEP, 0, PSYCHIC, 60, 20, 0 move HYPNOSIS, EFFECT_SLEEP, 0, PSYCHIC_TYPE, 60, 20, 0
move MEDITATE, EFFECT_ATTACK_UP, 0, PSYCHIC, 100, 40, 0 move MEDITATE, EFFECT_ATTACK_UP, 0, PSYCHIC_TYPE, 100, 40, 0
move AGILITY, EFFECT_SPEED_UP_2, 0, PSYCHIC, 100, 30, 0 move AGILITY, EFFECT_SPEED_UP_2, 0, PSYCHIC_TYPE, 100, 30, 0
move QUICK_ATTACK, EFFECT_PRIORITY_HIT, 40, NORMAL, 100, 30, 0 move QUICK_ATTACK, EFFECT_PRIORITY_HIT, 40, NORMAL, 100, 30, 0
move RAGE, EFFECT_RAGE, 20, NORMAL, 100, 20, 0 move RAGE, EFFECT_RAGE, 20, NORMAL, 100, 20, 0
move TELEPORT, EFFECT_TELEPORT, 0, PSYCHIC, 100, 20, 0 move TELEPORT, EFFECT_TELEPORT, 0, PSYCHIC_TYPE, 100, 20, 0
move NIGHT_SHADE, EFFECT_LEVEL_DAMAGE, 1, GHOST, 100, 15, 0 move NIGHT_SHADE, EFFECT_LEVEL_DAMAGE, 1, GHOST, 100, 15, 0
move MIMIC, EFFECT_MIMIC, 0, NORMAL, 100, 10, 0 move MIMIC, EFFECT_MIMIC, 0, NORMAL, 100, 10, 0
move SCREECH, EFFECT_DEFENSE_DOWN_2, 0, NORMAL, 85, 40, 0 move SCREECH, EFFECT_DEFENSE_DOWN_2, 0, NORMAL, 85, 40, 0
move DOUBLE_TEAM, EFFECT_EVASION_UP, 0, NORMAL, 100, 15, 0 move DOUBLE_TEAM, EFFECT_EVASION_UP, 0, NORMAL, 100, 15, 0
move RECOVER, EFFECT_HEAL, 0, NORMAL, 100, 20, 0 move RECOVER, EFFECT_HEAL, 0, NORMAL, 100, 20, 0
move HARDEN, EFFECT_DEFENSE_UP, 0, NORMAL, 100, 30, 0 move HARDEN, EFFECT_DEFENSE_UP, 0, NORMAL, 100, 30, 0
move MINIMIZE, EFFECT_EVASION_UP, 0, NORMAL, 100, 20, 0 move MINIMIZE, EFFECT_EVASION_UP, 0, NORMAL, 100, 20, 0
move SMOKESCREEN, EFFECT_ACCURACY_DOWN, 0, NORMAL, 100, 20, 0 move SMOKESCREEN, EFFECT_ACCURACY_DOWN, 0, NORMAL, 100, 20, 0
move CONFUSE_RAY, EFFECT_CONFUSE, 0, GHOST, 100, 10, 0 move CONFUSE_RAY, EFFECT_CONFUSE, 0, GHOST, 100, 10, 0
move WITHDRAW, EFFECT_DEFENSE_UP, 0, WATER, 100, 40, 0 move WITHDRAW, EFFECT_DEFENSE_UP, 0, WATER, 100, 40, 0
move DEFENSE_CURL, EFFECT_DEFENSE_CURL, 0, NORMAL, 100, 40, 0 move DEFENSE_CURL, EFFECT_DEFENSE_CURL, 0, NORMAL, 100, 40, 0
move BARRIER, EFFECT_DEFENSE_UP_2, 0, PSYCHIC, 100, 30, 0 move BARRIER, EFFECT_DEFENSE_UP_2, 0, PSYCHIC_TYPE, 100, 30, 0
move LIGHT_SCREEN, EFFECT_LIGHT_SCREEN, 0, PSYCHIC, 100, 30, 0 move LIGHT_SCREEN, EFFECT_LIGHT_SCREEN, 0, PSYCHIC_TYPE, 100, 30, 0
move HAZE, EFFECT_RESET_STATS, 0, ICE, 100, 30, 0 move HAZE, EFFECT_RESET_STATS, 0, ICE, 100, 30, 0
move REFLECT, EFFECT_REFLECT, 0, PSYCHIC, 100, 20, 0 move REFLECT, EFFECT_REFLECT, 0, PSYCHIC_TYPE, 100, 20, 0
move FOCUS_ENERGY, EFFECT_FOCUS_ENERGY, 0, NORMAL, 100, 30, 0 move FOCUS_ENERGY, EFFECT_FOCUS_ENERGY, 0, NORMAL, 100, 30, 0
move BIDE, EFFECT_BIDE, 0, NORMAL, 100, 10, 0 move BIDE, EFFECT_BIDE, 0, NORMAL, 100, 10, 0
move METRONOME, EFFECT_METRONOME, 0, NORMAL, 100, 10, 0 move METRONOME, EFFECT_METRONOME, 0, NORMAL, 100, 10, 0
move MIRROR_MOVE, EFFECT_MIRROR_MOVE, 0, FLYING, 100, 20, 0 move MIRROR_MOVE, EFFECT_MIRROR_MOVE, 0, FLYING, 100, 20, 0
move SELFDESTRUCT, EFFECT_SELFDESTRUCT, 200, NORMAL, 100, 5, 0 move SELFDESTRUCT, EFFECT_SELFDESTRUCT, 200, NORMAL, 100, 5, 0
move EGG_BOMB, EFFECT_NORMAL_HIT, 100, NORMAL, 75, 10, 0 move EGG_BOMB, EFFECT_NORMAL_HIT, 100, NORMAL, 75, 10, 0
move LICK, EFFECT_PARALYZE_HIT, 20, GHOST, 100, 30, 30 move LICK, EFFECT_PARALYZE_HIT, 20, GHOST, 100, 30, 30
move SMOG, EFFECT_POISON_HIT, 20, POISON, 70, 20, 40 move SMOG, EFFECT_POISON_HIT, 20, POISON, 70, 20, 40
move SLUDGE, EFFECT_POISON_HIT, 65, POISON, 100, 20, 30 move SLUDGE, EFFECT_POISON_HIT, 65, POISON, 100, 20, 30
move BONE_CLUB, EFFECT_FLINCH_HIT, 65, GROUND, 85, 20, 10 move BONE_CLUB, EFFECT_FLINCH_HIT, 65, GROUND, 85, 20, 10
move FIRE_BLAST, EFFECT_BURN_HIT, 120, FIRE, 85, 5, 10 move FIRE_BLAST, EFFECT_BURN_HIT, 120, FIRE, 85, 5, 10
move WATERFALL, EFFECT_NORMAL_HIT, 80, WATER, 100, 15, 0 move WATERFALL, EFFECT_NORMAL_HIT, 80, WATER, 100, 15, 0
move CLAMP, EFFECT_TRAP_TARGET, 35, WATER, 75, 10, 0 move CLAMP, EFFECT_TRAP_TARGET, 35, WATER, 75, 10, 0
move SWIFT, EFFECT_ALWAYS_HIT, 60, NORMAL, 100, 20, 0 move SWIFT, EFFECT_ALWAYS_HIT, 60, NORMAL, 100, 20, 0
move SKULL_BASH, EFFECT_SKULL_BASH, 100, NORMAL, 100, 15, 0 move SKULL_BASH, EFFECT_SKULL_BASH, 100, NORMAL, 100, 15, 0
move SPIKE_CANNON, EFFECT_MULTI_HIT, 20, NORMAL, 100, 15, 0 move SPIKE_CANNON, EFFECT_MULTI_HIT, 20, NORMAL, 100, 15, 0
move CONSTRICT, EFFECT_SPEED_DOWN_HIT, 10, NORMAL, 100, 35, 10 move CONSTRICT, EFFECT_SPEED_DOWN_HIT, 10, NORMAL, 100, 35, 10
move AMNESIA, EFFECT_SP_DEF_UP_2, 0, PSYCHIC, 100, 20, 0 move AMNESIA, EFFECT_SP_DEF_UP_2, 0, PSYCHIC_TYPE, 100, 20, 0
move KINESIS, EFFECT_ACCURACY_DOWN, 0, PSYCHIC, 80, 15, 0 move KINESIS, EFFECT_ACCURACY_DOWN, 0, PSYCHIC_TYPE, 80, 15, 0
move SOFTBOILED, EFFECT_HEAL, 0, NORMAL, 100, 10, 0 move SOFTBOILED, EFFECT_HEAL, 0, NORMAL, 100, 10, 0
move HI_JUMP_KICK, EFFECT_JUMP_KICK, 85, FIGHTING, 90, 20, 0 move HI_JUMP_KICK, EFFECT_JUMP_KICK, 85, FIGHTING, 90, 20, 0
move GLARE, EFFECT_PARALYZE, 0, NORMAL, 75, 30, 0 move GLARE, EFFECT_PARALYZE, 0, NORMAL, 75, 30, 0
move DREAM_EATER, EFFECT_DREAM_EATER, 100, PSYCHIC, 100, 15, 0 move DREAM_EATER, EFFECT_DREAM_EATER, 100, PSYCHIC_TYPE, 100, 15, 0
move POISON_GAS, EFFECT_POISON, 0, POISON, 55, 40, 0 move POISON_GAS, EFFECT_POISON, 0, POISON, 55, 40, 0
move BARRAGE, EFFECT_MULTI_HIT, 15, NORMAL, 85, 20, 0 move BARRAGE, EFFECT_MULTI_HIT, 15, NORMAL, 85, 20, 0
move LEECH_LIFE, EFFECT_LEECH_HIT, 20, BUG, 100, 15, 0 move LEECH_LIFE, EFFECT_LEECH_HIT, 20, BUG, 100, 15, 0
move LOVELY_KISS, EFFECT_SLEEP, 0, NORMAL, 75, 10, 0 move LOVELY_KISS, EFFECT_SLEEP, 0, NORMAL, 75, 10, 0
move SKY_ATTACK, EFFECT_SKY_ATTACK, 140, FLYING, 90, 5, 0 move SKY_ATTACK, EFFECT_SKY_ATTACK, 140, FLYING, 90, 5, 0
move TRANSFORM, EFFECT_TRANSFORM, 0, NORMAL, 100, 10, 0 move TRANSFORM, EFFECT_TRANSFORM, 0, NORMAL, 100, 10, 0
move BUBBLE, EFFECT_SPEED_DOWN_HIT, 20, WATER, 100, 30, 10 move BUBBLE, EFFECT_SPEED_DOWN_HIT, 20, WATER, 100, 30, 10
move DIZZY_PUNCH, EFFECT_CONFUSE_HIT, 70, NORMAL, 100, 10, 20 move DIZZY_PUNCH, EFFECT_CONFUSE_HIT, 70, NORMAL, 100, 10, 20
move SPORE, EFFECT_SLEEP, 0, GRASS, 100, 15, 0 move SPORE, EFFECT_SLEEP, 0, GRASS, 100, 15, 0
move FLASH, EFFECT_ACCURACY_DOWN, 0, NORMAL, 70, 20, 0 move FLASH, EFFECT_ACCURACY_DOWN, 0, NORMAL, 70, 20, 0
move PSYWAVE, EFFECT_PSYWAVE, 1, PSYCHIC, 80, 15, 0 move PSYWAVE, EFFECT_PSYWAVE, 1, PSYCHIC_TYPE, 80, 15, 0
move SPLASH, EFFECT_SPLASH, 0, NORMAL, 100, 40, 0 move SPLASH, EFFECT_SPLASH, 0, NORMAL, 100, 40, 0
move ACID_ARMOR, EFFECT_DEFENSE_UP_2, 0, POISON, 100, 40, 0 move ACID_ARMOR, EFFECT_DEFENSE_UP_2, 0, POISON, 100, 40, 0
move CRABHAMMER, EFFECT_NORMAL_HIT, 90, WATER, 85, 10, 0 move CRABHAMMER, EFFECT_NORMAL_HIT, 90, WATER, 85, 10, 0
move EXPLOSION, EFFECT_SELFDESTRUCT, 250, NORMAL, 100, 5, 0 move EXPLOSION, EFFECT_SELFDESTRUCT, 250, NORMAL, 100, 5, 0
move FURY_SWIPES, EFFECT_MULTI_HIT, 18, NORMAL, 80, 15, 0 move FURY_SWIPES, EFFECT_MULTI_HIT, 18, NORMAL, 80, 15, 0
move BONEMERANG, EFFECT_DOUBLE_HIT, 50, GROUND, 90, 10, 0 move BONEMERANG, EFFECT_DOUBLE_HIT, 50, GROUND, 90, 10, 0
move REST, EFFECT_HEAL, 0, PSYCHIC, 100, 10, 0 move REST, EFFECT_HEAL, 0, PSYCHIC_TYPE, 100, 10, 0
move ROCK_SLIDE, EFFECT_FLINCH_HIT, 75, ROCK, 90, 10, 30 move ROCK_SLIDE, EFFECT_FLINCH_HIT, 75, ROCK, 90, 10, 30
move HYPER_FANG, EFFECT_FLINCH_HIT, 80, NORMAL, 90, 15, 10 move HYPER_FANG, EFFECT_FLINCH_HIT, 80, NORMAL, 90, 15, 10
move SHARPEN, EFFECT_ATTACK_UP, 0, NORMAL, 100, 30, 0 move SHARPEN, EFFECT_ATTACK_UP, 0, NORMAL, 100, 30, 0
move CONVERSION, EFFECT_CONVERSION, 0, NORMAL, 100, 30, 0 move CONVERSION, EFFECT_CONVERSION, 0, NORMAL, 100, 30, 0
move TRI_ATTACK, EFFECT_TRI_ATTACK, 80, NORMAL, 100, 10, 20 move TRI_ATTACK, EFFECT_TRI_ATTACK, 80, NORMAL, 100, 10, 20
move SUPER_FANG, EFFECT_SUPER_FANG, 1, NORMAL, 90, 10, 0 move SUPER_FANG, EFFECT_SUPER_FANG, 1, NORMAL, 90, 10, 0
move SLASH, EFFECT_NORMAL_HIT, 70, NORMAL, 100, 20, 0 move SLASH, EFFECT_NORMAL_HIT, 70, NORMAL, 100, 20, 0
move SUBSTITUTE, EFFECT_SUBSTITUTE, 0, NORMAL, 100, 10, 0 move SUBSTITUTE, EFFECT_SUBSTITUTE, 0, NORMAL, 100, 10, 0
move STRUGGLE, EFFECT_RECOIL_HIT, 50, NORMAL, 100, 1, 0 move STRUGGLE, EFFECT_RECOIL_HIT, 50, NORMAL, 100, 1, 0
move SKETCH, EFFECT_SKETCH, 0, NORMAL, 100, 1, 0 move SKETCH, EFFECT_SKETCH, 0, NORMAL, 100, 1, 0
move TRIPLE_KICK, EFFECT_TRIPLE_KICK, 10, FIGHTING, 90, 10, 0 move TRIPLE_KICK, EFFECT_TRIPLE_KICK, 10, FIGHTING, 90, 10, 0
move THIEF, EFFECT_THIEF, 40, DARK, 100, 10, 100 move THIEF, EFFECT_THIEF, 40, DARK, 100, 10, 100
move SPIDER_WEB, EFFECT_MEAN_LOOK, 0, BUG, 100, 10, 0 move SPIDER_WEB, EFFECT_MEAN_LOOK, 0, BUG, 100, 10, 0
move MIND_READER, EFFECT_LOCK_ON, 0, NORMAL, 100, 5, 0 move MIND_READER, EFFECT_LOCK_ON, 0, NORMAL, 100, 5, 0
move NIGHTMARE, EFFECT_NIGHTMARE, 0, GHOST, 100, 15, 0 move NIGHTMARE, EFFECT_NIGHTMARE, 0, GHOST, 100, 15, 0
move FLAME_WHEEL, EFFECT_FLAME_WHEEL, 60, FIRE, 100, 25, 10 move FLAME_WHEEL, EFFECT_FLAME_WHEEL, 60, FIRE, 100, 25, 10
move SNORE, EFFECT_SNORE, 40, NORMAL, 100, 15, 30 move SNORE, EFFECT_SNORE, 40, NORMAL, 100, 15, 30
move CURSE, EFFECT_CURSE, 0, CURSE_T, 100, 10, 0 move CURSE, EFFECT_CURSE, 0, CURSE_TYPE, 100, 10, 0
move FLAIL, EFFECT_REVERSAL, 1, NORMAL, 100, 15, 0 move FLAIL, EFFECT_REVERSAL, 1, NORMAL, 100, 15, 0
move CONVERSION2, EFFECT_CONVERSION2, 0, NORMAL, 100, 30, 0 move CONVERSION2, EFFECT_CONVERSION2, 0, NORMAL, 100, 30, 0
move AEROBLAST, EFFECT_NORMAL_HIT, 100, FLYING, 95, 5, 0 move AEROBLAST, EFFECT_NORMAL_HIT, 100, FLYING, 95, 5, 0
move COTTON_SPORE, EFFECT_SPEED_DOWN_2, 0, GRASS, 85, 40, 0 move COTTON_SPORE, EFFECT_SPEED_DOWN_2, 0, GRASS, 85, 40, 0
move REVERSAL, EFFECT_REVERSAL, 1, FIGHTING, 100, 15, 0 move REVERSAL, EFFECT_REVERSAL, 1, FIGHTING, 100, 15, 0
move SPITE, EFFECT_SPITE, 0, GHOST, 100, 10, 0 move SPITE, EFFECT_SPITE, 0, GHOST, 100, 10, 0
move POWDER_SNOW, EFFECT_FREEZE_HIT, 40, ICE, 100, 25, 10 move POWDER_SNOW, EFFECT_FREEZE_HIT, 40, ICE, 100, 25, 10
move PROTECT, EFFECT_PROTECT, 0, NORMAL, 100, 10, 0 move PROTECT, EFFECT_PROTECT, 0, NORMAL, 100, 10, 0
move MACH_PUNCH, EFFECT_PRIORITY_HIT, 40, FIGHTING, 100, 30, 0 move MACH_PUNCH, EFFECT_PRIORITY_HIT, 40, FIGHTING, 100, 30, 0
move SCARY_FACE, EFFECT_SPEED_DOWN_2, 0, NORMAL, 90, 10, 0 move SCARY_FACE, EFFECT_SPEED_DOWN_2, 0, NORMAL, 90, 10, 0
move FAINT_ATTACK, EFFECT_ALWAYS_HIT, 60, DARK, 100, 20, 0 move FAINT_ATTACK, EFFECT_ALWAYS_HIT, 60, DARK, 100, 20, 0
move SWEET_KISS, EFFECT_CONFUSE, 0, NORMAL, 75, 10, 0 move SWEET_KISS, EFFECT_CONFUSE, 0, NORMAL, 75, 10, 0
move BELLY_DRUM, EFFECT_BELLY_DRUM, 0, NORMAL, 100, 10, 0 move BELLY_DRUM, EFFECT_BELLY_DRUM, 0, NORMAL, 100, 10, 0
move SLUDGE_BOMB, EFFECT_POISON_HIT, 90, POISON, 100, 10, 30 move SLUDGE_BOMB, EFFECT_POISON_HIT, 90, POISON, 100, 10, 30
move MUD_SLAP, EFFECT_ACCURACY_DOWN_HIT, 20, GROUND, 100, 10, 100 move MUD_SLAP, EFFECT_ACCURACY_DOWN_HIT, 20, GROUND, 100, 10, 100
move OCTAZOOKA, EFFECT_ACCURACY_DOWN_HIT, 65, WATER, 85, 10, 50 move OCTAZOOKA, EFFECT_ACCURACY_DOWN_HIT, 65, WATER, 85, 10, 50
move SPIKES, EFFECT_SPIKES, 0, GROUND, 100, 20, 0 move SPIKES, EFFECT_SPIKES, 0, GROUND, 100, 20, 0
move ZAP_CANNON, EFFECT_PARALYZE_HIT, 100, ELECTRIC, 50, 5, 100 move ZAP_CANNON, EFFECT_PARALYZE_HIT, 100, ELECTRIC, 50, 5, 100
move FORESIGHT, EFFECT_FORESIGHT, 0, NORMAL, 100, 40, 0 move FORESIGHT, EFFECT_FORESIGHT, 0, NORMAL, 100, 40, 0
move DESTINY_BOND, EFFECT_DESTINY_BOND, 0, GHOST, 100, 5, 0 move DESTINY_BOND, EFFECT_DESTINY_BOND, 0, GHOST, 100, 5, 0
move PERISH_SONG, EFFECT_PERISH_SONG, 0, NORMAL, 100, 5, 0 move PERISH_SONG, EFFECT_PERISH_SONG, 0, NORMAL, 100, 5, 0
move ICY_WIND, EFFECT_SPEED_DOWN_HIT, 55, ICE, 95, 15, 100 move ICY_WIND, EFFECT_SPEED_DOWN_HIT, 55, ICE, 95, 15, 100
move DETECT, EFFECT_PROTECT, 0, FIGHTING, 100, 5, 0 move DETECT, EFFECT_PROTECT, 0, FIGHTING, 100, 5, 0
move BONE_RUSH, EFFECT_MULTI_HIT, 25, GROUND, 80, 10, 0 move BONE_RUSH, EFFECT_MULTI_HIT, 25, GROUND, 80, 10, 0
move LOCK_ON, EFFECT_LOCK_ON, 0, NORMAL, 100, 5, 0 move LOCK_ON, EFFECT_LOCK_ON, 0, NORMAL, 100, 5, 0
move OUTRAGE, EFFECT_RAMPAGE, 90, DRAGON, 100, 15, 0 move OUTRAGE, EFFECT_RAMPAGE, 90, DRAGON, 100, 15, 0
move SANDSTORM, EFFECT_SANDSTORM, 0, ROCK, 100, 10, 0 move SANDSTORM, EFFECT_SANDSTORM, 0, ROCK, 100, 10, 0
move GIGA_DRAIN, EFFECT_LEECH_HIT, 60, GRASS, 100, 5, 0 move GIGA_DRAIN, EFFECT_LEECH_HIT, 60, GRASS, 100, 5, 0
move ENDURE, EFFECT_ENDURE, 0, NORMAL, 100, 10, 0 move ENDURE, EFFECT_ENDURE, 0, NORMAL, 100, 10, 0
move CHARM, EFFECT_ATTACK_DOWN_2, 0, NORMAL, 100, 20, 0 move CHARM, EFFECT_ATTACK_DOWN_2, 0, NORMAL, 100, 20, 0
move ROLLOUT, EFFECT_ROLLOUT, 30, ROCK, 90, 20, 0 move ROLLOUT, EFFECT_ROLLOUT, 30, ROCK, 90, 20, 0
move FALSE_SWIPE, EFFECT_FALSE_SWIPE, 40, NORMAL, 100, 40, 0 move FALSE_SWIPE, EFFECT_FALSE_SWIPE, 40, NORMAL, 100, 40, 0
move SWAGGER, EFFECT_SWAGGER, 0, NORMAL, 90, 15, 100 move SWAGGER, EFFECT_SWAGGER, 0, NORMAL, 90, 15, 100
move MILK_DRINK, EFFECT_HEAL, 0, NORMAL, 100, 10, 0 move MILK_DRINK, EFFECT_HEAL, 0, NORMAL, 100, 10, 0
move SPARK, EFFECT_PARALYZE_HIT, 65, ELECTRIC, 100, 20, 30 move SPARK, EFFECT_PARALYZE_HIT, 65, ELECTRIC, 100, 20, 30
move FURY_CUTTER, EFFECT_FURY_CUTTER, 10, BUG, 95, 20, 0 move FURY_CUTTER, EFFECT_FURY_CUTTER, 10, BUG, 95, 20, 0
move STEEL_WING, EFFECT_DEFENSE_UP_HIT, 70, STEEL, 90, 25, 10 move STEEL_WING, EFFECT_DEFENSE_UP_HIT, 70, STEEL, 90, 25, 10
move MEAN_LOOK, EFFECT_MEAN_LOOK, 0, NORMAL, 100, 5, 0 move MEAN_LOOK, EFFECT_MEAN_LOOK, 0, NORMAL, 100, 5, 0
move ATTRACT, EFFECT_ATTRACT, 0, NORMAL, 100, 15, 0 move ATTRACT, EFFECT_ATTRACT, 0, NORMAL, 100, 15, 0
move SLEEP_TALK, EFFECT_SLEEP_TALK, 0, NORMAL, 100, 10, 0 move SLEEP_TALK, EFFECT_SLEEP_TALK, 0, NORMAL, 100, 10, 0
move HEAL_BELL, EFFECT_HEAL_BELL, 0, NORMAL, 100, 5, 0 move HEAL_BELL, EFFECT_HEAL_BELL, 0, NORMAL, 100, 5, 0
move RETURN, EFFECT_RETURN, 1, NORMAL, 100, 20, 0 move RETURN, EFFECT_RETURN, 1, NORMAL, 100, 20, 0
move PRESENT, EFFECT_PRESENT, 1, NORMAL, 90, 15, 0 move PRESENT, EFFECT_PRESENT, 1, NORMAL, 90, 15, 0
move FRUSTRATION, EFFECT_FRUSTRATION, 1, NORMAL, 100, 20, 0 move FRUSTRATION, EFFECT_FRUSTRATION, 1, NORMAL, 100, 20, 0
move SAFEGUARD, EFFECT_SAFEGUARD, 0, NORMAL, 100, 25, 0 move SAFEGUARD, EFFECT_SAFEGUARD, 0, NORMAL, 100, 25, 0
move PAIN_SPLIT, EFFECT_PAIN_SPLIT, 0, NORMAL, 100, 20, 0 move PAIN_SPLIT, EFFECT_PAIN_SPLIT, 0, NORMAL, 100, 20, 0
move SACRED_FIRE, EFFECT_SACRED_FIRE, 100, FIRE, 95, 5, 50 move SACRED_FIRE, EFFECT_SACRED_FIRE, 100, FIRE, 95, 5, 50
move MAGNITUDE, EFFECT_MAGNITUDE, 1, GROUND, 100, 30, 0 move MAGNITUDE, EFFECT_MAGNITUDE, 1, GROUND, 100, 30, 0
move DYNAMICPUNCH, EFFECT_CONFUSE_HIT, 100, FIGHTING, 50, 5, 100 move DYNAMICPUNCH, EFFECT_CONFUSE_HIT, 100, FIGHTING, 50, 5, 100
move MEGAHORN, EFFECT_NORMAL_HIT, 120, BUG, 85, 10, 0 move MEGAHORN, EFFECT_NORMAL_HIT, 120, BUG, 85, 10, 0
move DRAGONBREATH, EFFECT_PARALYZE_HIT, 60, DRAGON, 100, 20, 30 move DRAGONBREATH, EFFECT_PARALYZE_HIT, 60, DRAGON, 100, 20, 30
move BATON_PASS, EFFECT_BATON_PASS, 0, NORMAL, 100, 40, 0 move BATON_PASS, EFFECT_BATON_PASS, 0, NORMAL, 100, 40, 0
move ENCORE, EFFECT_ENCORE, 0, NORMAL, 100, 5, 0 move ENCORE, EFFECT_ENCORE, 0, NORMAL, 100, 5, 0
move PURSUIT, EFFECT_PURSUIT, 40, DARK, 100, 20, 0 move PURSUIT, EFFECT_PURSUIT, 40, DARK, 100, 20, 0
move RAPID_SPIN, EFFECT_RAPID_SPIN, 20, NORMAL, 100, 40, 0 move RAPID_SPIN, EFFECT_RAPID_SPIN, 20, NORMAL, 100, 40, 0
move SWEET_SCENT, EFFECT_EVASION_DOWN, 0, NORMAL, 100, 20, 0 move SWEET_SCENT, EFFECT_EVASION_DOWN, 0, NORMAL, 100, 20, 0
move IRON_TAIL, EFFECT_DEFENSE_DOWN_HIT, 100, STEEL, 75, 15, 30 move IRON_TAIL, EFFECT_DEFENSE_DOWN_HIT, 100, STEEL, 75, 15, 30
move METAL_CLAW, EFFECT_ATTACK_UP_HIT, 50, STEEL, 95, 35, 10 move METAL_CLAW, EFFECT_ATTACK_UP_HIT, 50, STEEL, 95, 35, 10
move VITAL_THROW, EFFECT_ALWAYS_HIT, 70, FIGHTING, 100, 10, 0 move VITAL_THROW, EFFECT_ALWAYS_HIT, 70, FIGHTING, 100, 10, 0
move MORNING_SUN, EFFECT_MORNING_SUN, 0, NORMAL, 100, 5, 0 move MORNING_SUN, EFFECT_MORNING_SUN, 0, NORMAL, 100, 5, 0
move SYNTHESIS, EFFECT_SYNTHESIS, 0, GRASS, 100, 5, 0 move SYNTHESIS, EFFECT_SYNTHESIS, 0, GRASS, 100, 5, 0
move MOONLIGHT, EFFECT_MOONLIGHT, 0, NORMAL, 100, 5, 0 move MOONLIGHT, EFFECT_MOONLIGHT, 0, NORMAL, 100, 5, 0
move HIDDEN_POWER, EFFECT_HIDDEN_POWER, 1, NORMAL, 100, 15, 0 move HIDDEN_POWER, EFFECT_HIDDEN_POWER, 1, NORMAL, 100, 15, 0
move CROSS_CHOP, EFFECT_NORMAL_HIT, 100, FIGHTING, 80, 5, 0 move CROSS_CHOP, EFFECT_NORMAL_HIT, 100, FIGHTING, 80, 5, 0
move TWISTER, EFFECT_TWISTER, 40, DRAGON, 100, 20, 20 move TWISTER, EFFECT_TWISTER, 40, DRAGON, 100, 20, 20
move RAIN_DANCE, EFFECT_RAIN_DANCE, 0, WATER, 90, 5, 0 move RAIN_DANCE, EFFECT_RAIN_DANCE, 0, WATER, 90, 5, 0
move SUNNY_DAY, EFFECT_SUNNY_DAY, 0, FIRE, 90, 5, 0 move SUNNY_DAY, EFFECT_SUNNY_DAY, 0, FIRE, 90, 5, 0
move CRUNCH, EFFECT_SP_DEF_DOWN_HIT, 80, DARK, 100, 15, 20 move CRUNCH, EFFECT_SP_DEF_DOWN_HIT, 80, DARK, 100, 15, 20
move MIRROR_COAT, EFFECT_MIRROR_COAT, 1, PSYCHIC, 100, 20, 0 move MIRROR_COAT, EFFECT_MIRROR_COAT, 1, PSYCHIC_TYPE, 100, 20, 0
move PSYCH_UP, EFFECT_PSYCH_UP, 0, NORMAL, 100, 10, 0 move PSYCH_UP, EFFECT_PSYCH_UP, 0, NORMAL, 100, 10, 0
move EXTREMESPEED, EFFECT_PRIORITY_HIT, 80, NORMAL, 100, 5, 0 move EXTREMESPEED, EFFECT_PRIORITY_HIT, 80, NORMAL, 100, 5, 0
move ANCIENTPOWER, EFFECT_ALL_UP_HIT, 60, ROCK, 100, 5, 10 move ANCIENTPOWER, EFFECT_ALL_UP_HIT, 60, ROCK, 100, 5, 10
move SHADOW_BALL, EFFECT_SP_DEF_DOWN_HIT, 80, GHOST, 100, 15, 20 move SHADOW_BALL, EFFECT_SP_DEF_DOWN_HIT, 80, GHOST, 100, 15, 20
move FUTURE_SIGHT, EFFECT_FUTURE_SIGHT, 80, PSYCHIC, 90, 15, 0 move FUTURE_SIGHT, EFFECT_FUTURE_SIGHT, 80, PSYCHIC_TYPE, 90, 15, 0
move ROCK_SMASH, EFFECT_DEFENSE_DOWN_HIT, 20, FIGHTING, 100, 15, 50 move ROCK_SMASH, EFFECT_DEFENSE_DOWN_HIT, 20, FIGHTING, 100, 15, 50
move WHIRLPOOL, EFFECT_TRAP_TARGET, 15, WATER, 70, 15, 0 move WHIRLPOOL, EFFECT_TRAP_TARGET, 15, WATER, 70, 15, 0
move BEAT_UP, EFFECT_BEAT_UP, 10, DARK, 100, 10, 0 move BEAT_UP, EFFECT_BEAT_UP, 10, DARK, 100, 10, 0

2
data/pokemon/base_stats/abra.asm
View File

@ -3,7 +3,7 @@
db 25, 20, 15, 90, 105, 55 db 25, 20, 15, 90, 105, 55
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db PSYCHIC, PSYCHIC ; type db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 200 ; catch rate db 200 ; catch rate
db 73 ; base exp db 73 ; base exp
db NO_ITEM, NO_ITEM ; items db NO_ITEM, NO_ITEM ; items

2
data/pokemon/base_stats/alakazam.asm
View File

@ -3,7 +3,7 @@
db 55, 50, 45, 120, 135, 85 db 55, 50, 45, 120, 135, 85
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db PSYCHIC, PSYCHIC ; type db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 50 ; catch rate db 50 ; catch rate
db 186 ; base exp db 186 ; base exp
db NO_ITEM, NO_ITEM ; items db NO_ITEM, NO_ITEM ; items

2
data/pokemon/base_stats/celebi.asm
View File

@ -3,7 +3,7 @@
db 100, 100, 100, 100, 100, 100 db 100, 100, 100, 100, 100, 100
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db PSYCHIC, GRASS ; type db PSYCHIC_TYPE, GRASS ; type
db 45 ; catch rate db 45 ; catch rate
db 64 ; base exp db 64 ; base exp
db NO_ITEM, MIRACLEBERRY ; items db NO_ITEM, MIRACLEBERRY ; items

2
data/pokemon/base_stats/drowzee.asm
View File

@ -3,7 +3,7 @@
db 60, 48, 45, 42, 43, 90 db 60, 48, 45, 42, 43, 90
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db PSYCHIC, PSYCHIC ; type db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 190 ; catch rate db 190 ; catch rate
db 102 ; base exp db 102 ; base exp
db NO_ITEM, NO_ITEM ; items db NO_ITEM, NO_ITEM ; items

2
data/pokemon/base_stats/espeon.asm
View File

@ -3,7 +3,7 @@
db 65, 65, 60, 110, 130, 95 db 65, 65, 60, 110, 130, 95
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db PSYCHIC, PSYCHIC ; type db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 45 ; catch rate db 45 ; catch rate
db 197 ; base exp db 197 ; base exp
db NO_ITEM, NO_ITEM ; items db NO_ITEM, NO_ITEM ; items

2
data/pokemon/base_stats/exeggcute.asm
View File

@ -3,7 +3,7 @@
db 60, 40, 80, 40, 60, 45 db 60, 40, 80, 40, 60, 45
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db GRASS, PSYCHIC ; type db GRASS, PSYCHIC_TYPE ; type
db 90 ; catch rate db 90 ; catch rate
db 98 ; base exp db 98 ; base exp
db NO_ITEM, NO_ITEM ; items db NO_ITEM, NO_ITEM ; items

2
data/pokemon/base_stats/exeggutor.asm
View File

@ -3,7 +3,7 @@
db 95, 95, 85, 55, 125, 65 db 95, 95, 85, 55, 125, 65
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db GRASS, PSYCHIC ; type db GRASS, PSYCHIC_TYPE ; type
db 45 ; catch rate db 45 ; catch rate
db 212 ; base exp db 212 ; base exp
db NO_ITEM, NO_ITEM ; items db NO_ITEM, NO_ITEM ; items

2
data/pokemon/base_stats/girafarig.asm
View File

@ -3,7 +3,7 @@
db 70, 80, 65, 85, 90, 65 db 70, 80, 65, 85, 90, 65
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db NORMAL, PSYCHIC ; type db NORMAL, PSYCHIC_TYPE ; type
db 60 ; catch rate db 60 ; catch rate
db 149 ; base exp db 149 ; base exp
db NO_ITEM, NO_ITEM ; items db NO_ITEM, NO_ITEM ; items

2
data/pokemon/base_stats/hypno.asm
View File

@ -3,7 +3,7 @@
db 85, 73, 70, 67, 73, 115 db 85, 73, 70, 67, 73, 115
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db PSYCHIC, PSYCHIC ; type db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 75 ; catch rate db 75 ; catch rate
db 165 ; base exp db 165 ; base exp
db NO_ITEM, NO_ITEM ; items db NO_ITEM, NO_ITEM ; items

2
data/pokemon/base_stats/jynx.asm
View File

@ -3,7 +3,7 @@
db 65, 50, 35, 95, 115, 95 db 65, 50, 35, 95, 115, 95
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db ICE, PSYCHIC ; type db ICE, PSYCHIC_TYPE ; type
db 45 ; catch rate db 45 ; catch rate
db 137 ; base exp db 137 ; base exp
db ICE_BERRY, ICE_BERRY ; items db ICE_BERRY, ICE_BERRY ; items

2
data/pokemon/base_stats/kadabra.asm
View File

@ -3,7 +3,7 @@
db 40, 35, 30, 105, 120, 70 db 40, 35, 30, 105, 120, 70
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db PSYCHIC, PSYCHIC ; type db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 100 ; catch rate db 100 ; catch rate
db 145 ; base exp db 145 ; base exp
db NO_ITEM, NO_ITEM ; items db NO_ITEM, NO_ITEM ; items

2
data/pokemon/base_stats/lugia.asm
View File

@ -3,7 +3,7 @@
db 106, 90, 130, 110, 90, 154 db 106, 90, 130, 110, 90, 154
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db PSYCHIC, FLYING ; type db PSYCHIC_TYPE, FLYING ; type
db 3 ; catch rate db 3 ; catch rate
db 220 ; base exp db 220 ; base exp
db NO_ITEM, NO_ITEM ; items db NO_ITEM, NO_ITEM ; items

2
data/pokemon/base_stats/mew.asm
View File

@ -3,7 +3,7 @@
db 100, 100, 100, 100, 100, 100 db 100, 100, 100, 100, 100, 100
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db PSYCHIC, PSYCHIC ; type db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 45 ; catch rate db 45 ; catch rate
db 64 ; base exp db 64 ; base exp
db NO_ITEM, MIRACLEBERRY ; items db NO_ITEM, MIRACLEBERRY ; items

2
data/pokemon/base_stats/mewtwo.asm
View File

@ -3,7 +3,7 @@
db 106, 110, 90, 130, 154, 90 db 106, 110, 90, 130, 154, 90
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db PSYCHIC, PSYCHIC ; type db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 3 ; catch rate db 3 ; catch rate
db 220 ; base exp db 220 ; base exp
db NO_ITEM, BERSERK_GENE ; items db NO_ITEM, BERSERK_GENE ; items

2
data/pokemon/base_stats/mr__mime.asm
View File

@ -3,7 +3,7 @@
db 40, 45, 65, 90, 100, 120 db 40, 45, 65, 90, 100, 120
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db PSYCHIC, PSYCHIC ; type db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 45 ; catch rate db 45 ; catch rate
db 136 ; base exp db 136 ; base exp
db NO_ITEM, MYSTERYBERRY ; items db NO_ITEM, MYSTERYBERRY ; items

2
data/pokemon/base_stats/natu.asm
View File

@ -3,7 +3,7 @@
db 40, 50, 45, 70, 70, 45 db 40, 50, 45, 70, 70, 45
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db PSYCHIC, FLYING ; type db PSYCHIC_TYPE, FLYING ; type
db 190 ; catch rate db 190 ; catch rate
db 73 ; base exp db 73 ; base exp
db NO_ITEM, NO_ITEM ; items db NO_ITEM, NO_ITEM ; items

2
data/pokemon/base_stats/slowbro.asm
View File

@ -3,7 +3,7 @@
db 95, 75, 110, 30, 100, 80 db 95, 75, 110, 30, 100, 80
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db WATER, PSYCHIC ; type db WATER, PSYCHIC_TYPE ; type
db 75 ; catch rate db 75 ; catch rate
db 164 ; base exp db 164 ; base exp
db NO_ITEM, KINGS_ROCK ; items db NO_ITEM, KINGS_ROCK ; items

2
data/pokemon/base_stats/slowking.asm
View File

@ -3,7 +3,7 @@
db 95, 75, 80, 30, 100, 110 db 95, 75, 80, 30, 100, 110
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db WATER, PSYCHIC ; type db WATER, PSYCHIC_TYPE ; type
db 70 ; catch rate db 70 ; catch rate
db 164 ; base exp db 164 ; base exp
db NO_ITEM, KINGS_ROCK ; items db NO_ITEM, KINGS_ROCK ; items

2
data/pokemon/base_stats/slowpoke.asm
View File

@ -3,7 +3,7 @@
db 90, 65, 65, 15, 40, 40 db 90, 65, 65, 15, 40, 40
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db WATER, PSYCHIC ; type db WATER, PSYCHIC_TYPE ; type
db 190 ; catch rate db 190 ; catch rate
db 99 ; base exp db 99 ; base exp
db NO_ITEM, KINGS_ROCK ; items db NO_ITEM, KINGS_ROCK ; items

2
data/pokemon/base_stats/smoochum.asm
View File

@ -3,7 +3,7 @@
db 45, 30, 15, 65, 85, 65 db 45, 30, 15, 65, 85, 65
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db ICE, PSYCHIC ; type db ICE, PSYCHIC_TYPE ; type
db 45 ; catch rate db 45 ; catch rate
db 87 ; base exp db 87 ; base exp
db ICE_BERRY, ICE_BERRY ; items db ICE_BERRY, ICE_BERRY ; items

2
data/pokemon/base_stats/starmie.asm
View File

@ -3,7 +3,7 @@
db 60, 75, 85, 115, 100, 85 db 60, 75, 85, 115, 100, 85
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db WATER, PSYCHIC ; type db WATER, PSYCHIC_TYPE ; type
db 60 ; catch rate db 60 ; catch rate
db 207 ; base exp db 207 ; base exp
db STARDUST, STAR_PIECE ; items db STARDUST, STAR_PIECE ; items

2
data/pokemon/base_stats/unown.asm
View File

@ -3,7 +3,7 @@
db 48, 72, 48, 48, 72, 48 db 48, 72, 48, 48, 72, 48
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db PSYCHIC, PSYCHIC ; type db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 225 ; catch rate db 225 ; catch rate
db 61 ; base exp db 61 ; base exp
db NO_ITEM, NO_ITEM ; items db NO_ITEM, NO_ITEM ; items

2
data/pokemon/base_stats/wobbuffet.asm
View File

@ -3,7 +3,7 @@
db 190, 33, 58, 33, 33, 58 db 190, 33, 58, 33, 33, 58
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db PSYCHIC, PSYCHIC ; type db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 45 ; catch rate db 45 ; catch rate
db 177 ; base exp db 177 ; base exp
db NO_ITEM, NO_ITEM ; items db NO_ITEM, NO_ITEM ; items

2
data/pokemon/base_stats/xatu.asm
View File

@ -3,7 +3,7 @@
db 65, 75, 70, 95, 95, 70 db 65, 75, 70, 95, 95, 70
; hp atk def spd sat sdf ; hp atk def spd sat sdf
db PSYCHIC, FLYING ; type db PSYCHIC_TYPE, FLYING ; type
db 75 ; catch rate db 75 ; catch rate
db 171 ; base exp db 171 ; base exp
db NO_ITEM, NO_ITEM ; items db NO_ITEM, NO_ITEM ; items

32
data/types/badge_type_boosts.asm
View File

@ -1,21 +1,21 @@
BadgeTypeBoosts: BadgeTypeBoosts:
; entries correspond to wJohtoBadges constants ; entries correspond to wJohtoBadges constants
db FLYING ; ZEPHYRBADGE db FLYING ; ZEPHYRBADGE
db BUG ; HIVEBADGE db BUG ; HIVEBADGE
db NORMAL ; PLAINBADGE db NORMAL ; PLAINBADGE
db GHOST ; FOGBADGE db GHOST ; FOGBADGE
db STEEL ; MINERALBADGE db STEEL ; MINERALBADGE
db FIGHTING ; STORMBADGE db FIGHTING ; STORMBADGE
db ICE ; GLACIERBADGE db ICE ; GLACIERBADGE
db DRAGON ; RISINGBADGE db DRAGON ; RISINGBADGE
; fallthrough ; fallthrough
; entries correspond to wKantoBadges constants ; entries correspond to wKantoBadges constants
db ROCK ; BOULDERBADGE db ROCK ; BOULDERBADGE
db WATER ; CASCADEBADGE db WATER ; CASCADEBADGE
db ELECTRIC ; THUNDERBADGE db ELECTRIC ; THUNDERBADGE
db GRASS ; RAINBOWBADGE db GRASS ; RAINBOWBADGE
db POISON ; SOULBADGE db POISON ; SOULBADGE
db PSYCHIC ; MARSHBADGE db PSYCHIC_TYPE ; MARSHBADGE
db FIRE ; VOLCANOBADGE db FIRE ; VOLCANOBADGE
db GROUND ; EARTHBADGE db GROUND ; EARTHBADGE
db -1 ; end db -1 ; end

2
data/types/search_types.asm
View File

@ -10,7 +10,7 @@ PokedexTypeSearchConversionTable:
db POISON db POISON
db GROUND db GROUND
db FLYING db FLYING
db PSYCHIC db PSYCHIC_TYPE
db BUG db BUG
db ROCK db ROCK
db GHOST db GHOST

34
data/types/type_boost_items.asm
View File

@ -1,19 +1,19 @@
TypeBoostItems: TypeBoostItems:
db HELD_NORMAL_BOOST, NORMAL ; PINK_BOW/POLKADOT_BOW db HELD_NORMAL_BOOST, NORMAL ; PINK_BOW/POLKADOT_BOW
db HELD_FIGHTING_BOOST, FIGHTING ; BLACKBELT db HELD_FIGHTING_BOOST, FIGHTING ; BLACKBELT_I
db HELD_FLYING_BOOST, FLYING ; SHARP_BEAK db HELD_FLYING_BOOST, FLYING ; SHARP_BEAK
db HELD_POISON_BOOST, POISON ; POISON BARB db HELD_POISON_BOOST, POISON ; POISON BARB
db HELD_GROUND_BOOST, GROUND ; SOFT_SAND db HELD_GROUND_BOOST, GROUND ; SOFT_SAND
db HELD_ROCK_BOOST, ROCK ; HARD_STONE db HELD_ROCK_BOOST, ROCK ; HARD_STONE
db HELD_BUG_BOOST, BUG ; SILVERPOWDER db HELD_BUG_BOOST, BUG ; SILVERPOWDER
db HELD_GHOST_BOOST, GHOST ; SPELL_TAG db HELD_GHOST_BOOST, GHOST ; SPELL_TAG
db HELD_FIRE_BOOST, FIRE ; CHARCOAL db HELD_FIRE_BOOST, FIRE ; CHARCOAL
db HELD_WATER_BOOST, WATER ; MYSTIC WATER db HELD_WATER_BOOST, WATER ; MYSTIC WATER
db HELD_GRASS_BOOST, GRASS ; MIRACLE_SEED db HELD_GRASS_BOOST, GRASS ; MIRACLE_SEED
db HELD_ELECTRIC_BOOST, ELECTRIC ; MAGNET db HELD_ELECTRIC_BOOST, ELECTRIC ; MAGNET
db HELD_PSYCHIC_BOOST, PSYCHIC ; TWISTEDSPOON db HELD_PSYCHIC_BOOST, PSYCHIC_TYPE ; TWISTEDSPOON
db HELD_ICE_BOOST, ICE ; NEVERMELTICE db HELD_ICE_BOOST, ICE ; NEVERMELTICE
db HELD_DRAGON_BOOST, DRAGON ; DRAGON_SCALE db HELD_DRAGON_BOOST, DRAGON ; DRAGON_SCALE
db HELD_DARK_BOOST, DARK ; BLACKGLASSES db HELD_DARK_BOOST, DARK ; BLACKGLASSES
db HELD_STEEL_BOOST, STEEL ; METAL_COAT db HELD_STEEL_BOOST, STEEL ; METAL_COAT
db -1 db -1

222
data/types/type_matchups.asm
View File

@ -1,118 +1,118 @@
TypeMatchups: TypeMatchups:
; attacker, defender, *= ; attacker, defender, *=
db NORMAL, ROCK, NOT_VERY_EFFECTIVE db NORMAL, ROCK, NOT_VERY_EFFECTIVE
db NORMAL, STEEL, NOT_VERY_EFFECTIVE db NORMAL, STEEL, NOT_VERY_EFFECTIVE
db FIRE, FIRE, NOT_VERY_EFFECTIVE db FIRE, FIRE, NOT_VERY_EFFECTIVE
db FIRE, WATER, NOT_VERY_EFFECTIVE db FIRE, WATER, NOT_VERY_EFFECTIVE
db FIRE, GRASS, SUPER_EFFECTIVE db FIRE, GRASS, SUPER_EFFECTIVE
db FIRE, ICE, SUPER_EFFECTIVE db FIRE, ICE, SUPER_EFFECTIVE
db FIRE, BUG, SUPER_EFFECTIVE db FIRE, BUG, SUPER_EFFECTIVE
db FIRE, ROCK, NOT_VERY_EFFECTIVE db FIRE, ROCK, NOT_VERY_EFFECTIVE
db FIRE, DRAGON, NOT_VERY_EFFECTIVE db FIRE, DRAGON, NOT_VERY_EFFECTIVE
db FIRE, STEEL, SUPER_EFFECTIVE db FIRE, STEEL, SUPER_EFFECTIVE
db WATER, FIRE, SUPER_EFFECTIVE db WATER, FIRE, SUPER_EFFECTIVE
db WATER, WATER, NOT_VERY_EFFECTIVE db WATER, WATER, NOT_VERY_EFFECTIVE
db WATER, GRASS, NOT_VERY_EFFECTIVE db WATER, GRASS, NOT_VERY_EFFECTIVE
db WATER, GROUND, SUPER_EFFECTIVE db WATER, GROUND, SUPER_EFFECTIVE
db WATER, ROCK, SUPER_EFFECTIVE db WATER, ROCK, SUPER_EFFECTIVE
db WATER, DRAGON, NOT_VERY_EFFECTIVE db WATER, DRAGON, NOT_VERY_EFFECTIVE
db ELECTRIC, WATER, SUPER_EFFECTIVE db ELECTRIC, WATER, SUPER_EFFECTIVE
db ELECTRIC, ELECTRIC, NOT_VERY_EFFECTIVE db ELECTRIC, ELECTRIC, NOT_VERY_EFFECTIVE
db ELECTRIC, GRASS, NOT_VERY_EFFECTIVE db ELECTRIC, GRASS, NOT_VERY_EFFECTIVE
db ELECTRIC, GROUND, NO_EFFECT db ELECTRIC, GROUND, NO_EFFECT
db ELECTRIC, FLYING, SUPER_EFFECTIVE db ELECTRIC, FLYING, SUPER_EFFECTIVE
db ELECTRIC, DRAGON, NOT_VERY_EFFECTIVE db ELECTRIC, DRAGON, NOT_VERY_EFFECTIVE
db GRASS, FIRE, NOT_VERY_EFFECTIVE db GRASS, FIRE, NOT_VERY_EFFECTIVE
db GRASS, WATER, SUPER_EFFECTIVE db GRASS, WATER, SUPER_EFFECTIVE
db GRASS, GRASS, NOT_VERY_EFFECTIVE db GRASS, GRASS, NOT_VERY_EFFECTIVE
db GRASS, POISON, NOT_VERY_EFFECTIVE db GRASS, POISON, NOT_VERY_EFFECTIVE
db GRASS, GROUND, SUPER_EFFECTIVE db GRASS, GROUND, SUPER_EFFECTIVE
db GRASS, FLYING, NOT_VERY_EFFECTIVE db GRASS, FLYING, NOT_VERY_EFFECTIVE
db GRASS, BUG, NOT_VERY_EFFECTIVE db GRASS, BUG, NOT_VERY_EFFECTIVE
db GRASS, ROCK, SUPER_EFFECTIVE db GRASS, ROCK, SUPER_EFFECTIVE
db GRASS, DRAGON, NOT_VERY_EFFECTIVE db GRASS, DRAGON, NOT_VERY_EFFECTIVE
db GRASS, STEEL, NOT_VERY_EFFECTIVE db GRASS, STEEL, NOT_VERY_EFFECTIVE
db ICE, WATER, NOT_VERY_EFFECTIVE db ICE, WATER, NOT_VERY_EFFECTIVE
db ICE, GRASS, SUPER_EFFECTIVE db ICE, GRASS, SUPER_EFFECTIVE
db ICE, ICE, NOT_VERY_EFFECTIVE db ICE, ICE, NOT_VERY_EFFECTIVE
db ICE, GROUND, SUPER_EFFECTIVE db ICE, GROUND, SUPER_EFFECTIVE
db ICE, FLYING, SUPER_EFFECTIVE db ICE, FLYING, SUPER_EFFECTIVE
db ICE, DRAGON, SUPER_EFFECTIVE db ICE, DRAGON, SUPER_EFFECTIVE
db ICE, STEEL, NOT_VERY_EFFECTIVE db ICE, STEEL, NOT_VERY_EFFECTIVE
db ICE, FIRE, NOT_VERY_EFFECTIVE db ICE, FIRE, NOT_VERY_EFFECTIVE
db FIGHTING, NORMAL, SUPER_EFFECTIVE db FIGHTING, NORMAL, SUPER_EFFECTIVE
db FIGHTING, ICE, SUPER_EFFECTIVE db FIGHTING, ICE, SUPER_EFFECTIVE
db FIGHTING, POISON, NOT_VERY_EFFECTIVE db FIGHTING, POISON, NOT_VERY_EFFECTIVE
db FIGHTING, FLYING, NOT_VERY_EFFECTIVE db FIGHTING, FLYING, NOT_VERY_EFFECTIVE
db FIGHTING, PSYCHIC, NOT_VERY_EFFECTIVE db FIGHTING, PSYCHIC_TYPE, NOT_VERY_EFFECTIVE
db FIGHTING, BUG, NOT_VERY_EFFECTIVE db FIGHTING, BUG, NOT_VERY_EFFECTIVE
db FIGHTING, ROCK, SUPER_EFFECTIVE db FIGHTING, ROCK, SUPER_EFFECTIVE
db FIGHTING, DARK, SUPER_EFFECTIVE db FIGHTING, DARK, SUPER_EFFECTIVE
db FIGHTING, STEEL, SUPER_EFFECTIVE db FIGHTING, STEEL, SUPER_EFFECTIVE
db POISON, GRASS, SUPER_EFFECTIVE db POISON, GRASS, SUPER_EFFECTIVE
db POISON, POISON, NOT_VERY_EFFECTIVE db POISON, POISON, NOT_VERY_EFFECTIVE
db POISON, GROUND, NOT_VERY_EFFECTIVE db POISON, GROUND, NOT_VERY_EFFECTIVE
db POISON, ROCK, NOT_VERY_EFFECTIVE db POISON, ROCK, NOT_VERY_EFFECTIVE
db POISON, GHOST, NOT_VERY_EFFECTIVE db POISON, GHOST, NOT_VERY_EFFECTIVE
db POISON, STEEL, NO_EFFECT db POISON, STEEL, NO_EFFECT
db GROUND, FIRE, SUPER_EFFECTIVE db GROUND, FIRE, SUPER_EFFECTIVE
db GROUND, ELECTRIC, SUPER_EFFECTIVE db GROUND, ELECTRIC, SUPER_EFFECTIVE
db GROUND, GRASS, NOT_VERY_EFFECTIVE db GROUND, GRASS, NOT_VERY_EFFECTIVE
db GROUND, POISON, SUPER_EFFECTIVE db GROUND, POISON, SUPER_EFFECTIVE
db GROUND, FLYING, NO_EFFECT db GROUND, FLYING, NO_EFFECT
db GROUND, BUG, NOT_VERY_EFFECTIVE db GROUND, BUG, NOT_VERY_EFFECTIVE
db GROUND, ROCK, SUPER_EFFECTIVE db GROUND, ROCK, SUPER_EFFECTIVE
db GROUND, STEEL, SUPER_EFFECTIVE db GROUND, STEEL, SUPER_EFFECTIVE
db FLYING, ELECTRIC, NOT_VERY_EFFECTIVE db FLYING, ELECTRIC, NOT_VERY_EFFECTIVE
db FLYING, GRASS, SUPER_EFFECTIVE db FLYING, GRASS, SUPER_EFFECTIVE
db FLYING, FIGHTING, SUPER_EFFECTIVE db FLYING, FIGHTING, SUPER_EFFECTIVE
db FLYING, BUG, SUPER_EFFECTIVE db FLYING, BUG, SUPER_EFFECTIVE
db FLYING, ROCK, NOT_VERY_EFFECTIVE db FLYING, ROCK, NOT_VERY_EFFECTIVE
db FLYING, STEEL, NOT_VERY_EFFECTIVE db FLYING, STEEL, NOT_VERY_EFFECTIVE
db PSYCHIC, FIGHTING, SUPER_EFFECTIVE db PSYCHIC_TYPE, FIGHTING, SUPER_EFFECTIVE
db PSYCHIC, POISON, SUPER_EFFECTIVE db PSYCHIC_TYPE, POISON, SUPER_EFFECTIVE
db PSYCHIC, PSYCHIC, NOT_VERY_EFFECTIVE db PSYCHIC_TYPE, PSYCHIC_TYPE, NOT_VERY_EFFECTIVE
db PSYCHIC, DARK, NO_EFFECT db PSYCHIC_TYPE, DARK, NO_EFFECT
db PSYCHIC, STEEL, NOT_VERY_EFFECTIVE db PSYCHIC_TYPE, STEEL, NOT_VERY_EFFECTIVE
db BUG, FIRE, NOT_VERY_EFFECTIVE db BUG, FIRE, NOT_VERY_EFFECTIVE
db BUG, GRASS, SUPER_EFFECTIVE db BUG, GRASS, SUPER_EFFECTIVE
db BUG, FIGHTING, NOT_VERY_EFFECTIVE db BUG, FIGHTING, NOT_VERY_EFFECTIVE
db BUG, POISON, NOT_VERY_EFFECTIVE db BUG, POISON, NOT_VERY_EFFECTIVE
db BUG, FLYING, NOT_VERY_EFFECTIVE db BUG, FLYING, NOT_VERY_EFFECTIVE
db BUG, PSYCHIC, SUPER_EFFECTIVE db BUG, PSYCHIC_TYPE, SUPER_EFFECTIVE
db BUG, GHOST, NOT_VERY_EFFECTIVE db BUG, GHOST, NOT_VERY_EFFECTIVE
db BUG, DARK, SUPER_EFFECTIVE db BUG, DARK, SUPER_EFFECTIVE
db BUG, STEEL, NOT_VERY_EFFECTIVE db BUG, STEEL, NOT_VERY_EFFECTIVE
db ROCK, FIRE, SUPER_EFFECTIVE db ROCK, FIRE, SUPER_EFFECTIVE
db ROCK, ICE, SUPER_EFFECTIVE db ROCK, ICE, SUPER_EFFECTIVE
db ROCK, FIGHTING, NOT_VERY_EFFECTIVE db ROCK, FIGHTING, NOT_VERY_EFFECTIVE
db ROCK, GROUND, NOT_VERY_EFFECTIVE db ROCK, GROUND, NOT_VERY_EFFECTIVE
db ROCK, FLYING, SUPER_EFFECTIVE db ROCK, FLYING, SUPER_EFFECTIVE
db ROCK, BUG, SUPER_EFFECTIVE db ROCK, BUG, SUPER_EFFECTIVE
db ROCK, STEEL, NOT_VERY_EFFECTIVE db ROCK, STEEL, NOT_VERY_EFFECTIVE
db GHOST, NORMAL, NO_EFFECT db GHOST, NORMAL, NO_EFFECT
db GHOST, PSYCHIC, SUPER_EFFECTIVE db GHOST, PSYCHIC_TYPE, SUPER_EFFECTIVE
db GHOST, DARK, NOT_VERY_EFFECTIVE db GHOST, DARK, NOT_VERY_EFFECTIVE
db GHOST, STEEL, NOT_VERY_EFFECTIVE db GHOST, STEEL, NOT_VERY_EFFECTIVE
db GHOST, GHOST, SUPER_EFFECTIVE db GHOST, GHOST, SUPER_EFFECTIVE
db DRAGON, DRAGON, SUPER_EFFECTIVE db DRAGON, DRAGON, SUPER_EFFECTIVE
db DRAGON, STEEL, NOT_VERY_EFFECTIVE db DRAGON, STEEL, NOT_VERY_EFFECTIVE
db DARK, FIGHTING, NOT_VERY_EFFECTIVE db DARK, FIGHTING, NOT_VERY_EFFECTIVE
db DARK, PSYCHIC, SUPER_EFFECTIVE db DARK, PSYCHIC_TYPE, SUPER_EFFECTIVE
db DARK, GHOST, SUPER_EFFECTIVE db DARK, GHOST, SUPER_EFFECTIVE
db DARK, DARK, NOT_VERY_EFFECTIVE db DARK, DARK, NOT_VERY_EFFECTIVE
db DARK, STEEL, NOT_VERY_EFFECTIVE db DARK, STEEL, NOT_VERY_EFFECTIVE
db STEEL, FIRE, NOT_VERY_EFFECTIVE db STEEL, FIRE, NOT_VERY_EFFECTIVE
db STEEL, WATER, NOT_VERY_EFFECTIVE db STEEL, WATER, NOT_VERY_EFFECTIVE
db STEEL, ELECTRIC, NOT_VERY_EFFECTIVE db STEEL, ELECTRIC, NOT_VERY_EFFECTIVE
db STEEL, ICE, SUPER_EFFECTIVE db STEEL, ICE, SUPER_EFFECTIVE
db STEEL, ROCK, SUPER_EFFECTIVE db STEEL, ROCK, SUPER_EFFECTIVE
db STEEL, STEEL, NOT_VERY_EFFECTIVE db STEEL, STEEL, NOT_VERY_EFFECTIVE
db -2 ; end (with Foresight) db -2 ; end (with Foresight)
; Foresight removes Ghost's immunities. ; Foresight removes Ghost's immunities.
db NORMAL, GHOST, NO_EFFECT db NORMAL, GHOST, NO_EFFECT
db FIGHTING, GHOST, NO_EFFECT db FIGHTING, GHOST, NO_EFFECT
db -1 ; end db -1 ; end

4
engine/battle/move_effects/conversion.asm
View File

@ -46,7 +46,7 @@ BattleCommand_Conversion:
ld a, [hl] ld a, [hl]
cp -1 cp -1
jr z, .fail jr z, .fail
cp CURSE_T cp CURSE_TYPE
jr z, .next jr z, .next
ld a, [de] ld a, [de]
cp [hl] cp [hl]
@ -75,7 +75,7 @@ BattleCommand_Conversion:
ld a, [hl] ld a, [hl]
cp -1 cp -1
jr z, .loop3 jr z, .loop3
cp CURSE_T cp CURSE_TYPE
jr z, .loop3 jr z, .loop3
ld a, [de] ld a, [de]
cp [hl] cp [hl]

2
engine/battle/move_effects/conversion2.asm
View File

@ -20,7 +20,7 @@ BattleCommand_Conversion2:
call GetMoveAttr call GetMoveAttr
ld d, a ld d, a
pop hl pop hl
cp CURSE_T cp CURSE_TYPE
jr z, .failed jr z, .failed
call AnimateCurrentMove call AnimateCurrentMove
call BattleCommand_SwitchTurn call BattleCommand_SwitchTurn

2
engine/events/std_scripts.asm
View File

@ -535,7 +535,7 @@ InitializeEventsScript:
setevent EVENT_PLAYERS_HOUSE_2F_DOLL_2 setevent EVENT_PLAYERS_HOUSE_2F_DOLL_2
setevent EVENT_PLAYERS_HOUSE_2F_BIG_DOLL setevent EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
setevent EVENT_DECO_BED_1 setevent EVENT_DECO_BED_1
setevent EVENT_DECO_PLANT_4 setevent EVENT_DECO_POSTER_1
setevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN setevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
setevent EVENT_OLIVINE_GYM_JASMINE setevent EVENT_OLIVINE_GYM_JASMINE
setevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN setevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN

2
engine/items/item_effects.asm
View File

@ -110,7 +110,7 @@ ItemEffects:
dw NoEffect ; MYSTIC_WATER dw NoEffect ; MYSTIC_WATER
dw NoEffect ; TWISTEDSPOON dw NoEffect ; TWISTEDSPOON
dw NoEffect ; WHT_APRICORN dw NoEffect ; WHT_APRICORN
dw NoEffect ; BLACKBELT dw NoEffect ; BLACKBELT_I
dw NoEffect ; BLK_APRICORN dw NoEffect ; BLK_APRICORN
dw NoEffect ; ITEM_64 dw NoEffect ; ITEM_64
dw NoEffect ; PNK_APRICORN dw NoEffect ; PNK_APRICORN

2
maps/LakeOfRage.asm
View File

@ -202,7 +202,7 @@ WesleyScript:
.MetWesley: .MetWesley:
writetext WesleyGivesGiftText writetext WesleyGivesGiftText
promptbutton promptbutton
verbosegiveitem BLACKBELT verbosegiveitem BLACKBELT_I
iffalse WesleyDoneScript iffalse WesleyDoneScript
setevent EVENT_GOT_BLACKBELT_FROM_WESLEY setevent EVENT_GOT_BLACKBELT_FROM_WESLEY
writetext WesleyGaveGiftText writetext WesleyGaveGiftText