pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07: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
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

File diff suppressed because it is too large Load Diff

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

Some files were not shown because too many files have changed in this diff Show More