You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Add suffixes to some constants to avoid ambiguity
- `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:
@@ -3,7 +3,7 @@
|
||||
db 25, 20, 15, 90, 105, 55
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db PSYCHIC, PSYCHIC ; type
|
||||
db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
|
||||
db 200 ; catch rate
|
||||
db 73 ; base exp
|
||||
db NO_ITEM, NO_ITEM ; items
|
||||
|
@@ -3,7 +3,7 @@
|
||||
db 55, 50, 45, 120, 135, 85
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db PSYCHIC, PSYCHIC ; type
|
||||
db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
|
||||
db 50 ; catch rate
|
||||
db 186 ; base exp
|
||||
db NO_ITEM, NO_ITEM ; items
|
||||
|
@@ -3,7 +3,7 @@
|
||||
db 100, 100, 100, 100, 100, 100
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db PSYCHIC, GRASS ; type
|
||||
db PSYCHIC_TYPE, GRASS ; type
|
||||
db 45 ; catch rate
|
||||
db 64 ; base exp
|
||||
db NO_ITEM, MIRACLEBERRY ; items
|
||||
|
@@ -3,7 +3,7 @@
|
||||
db 60, 48, 45, 42, 43, 90
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db PSYCHIC, PSYCHIC ; type
|
||||
db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
|
||||
db 190 ; catch rate
|
||||
db 102 ; base exp
|
||||
db NO_ITEM, NO_ITEM ; items
|
||||
|
@@ -3,7 +3,7 @@
|
||||
db 65, 65, 60, 110, 130, 95
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db PSYCHIC, PSYCHIC ; type
|
||||
db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
|
||||
db 45 ; catch rate
|
||||
db 197 ; base exp
|
||||
db NO_ITEM, NO_ITEM ; items
|
||||
|
@@ -3,7 +3,7 @@
|
||||
db 60, 40, 80, 40, 60, 45
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db GRASS, PSYCHIC ; type
|
||||
db GRASS, PSYCHIC_TYPE ; type
|
||||
db 90 ; catch rate
|
||||
db 98 ; base exp
|
||||
db NO_ITEM, NO_ITEM ; items
|
||||
|
@@ -3,7 +3,7 @@
|
||||
db 95, 95, 85, 55, 125, 65
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db GRASS, PSYCHIC ; type
|
||||
db GRASS, PSYCHIC_TYPE ; type
|
||||
db 45 ; catch rate
|
||||
db 212 ; base exp
|
||||
db NO_ITEM, NO_ITEM ; items
|
||||
|
@@ -3,7 +3,7 @@
|
||||
db 70, 80, 65, 85, 90, 65
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db NORMAL, PSYCHIC ; type
|
||||
db NORMAL, PSYCHIC_TYPE ; type
|
||||
db 60 ; catch rate
|
||||
db 149 ; base exp
|
||||
db NO_ITEM, NO_ITEM ; items
|
||||
|
@@ -3,7 +3,7 @@
|
||||
db 85, 73, 70, 67, 73, 115
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db PSYCHIC, PSYCHIC ; type
|
||||
db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
|
||||
db 75 ; catch rate
|
||||
db 165 ; base exp
|
||||
db NO_ITEM, NO_ITEM ; items
|
||||
|
@@ -3,7 +3,7 @@
|
||||
db 65, 50, 35, 95, 115, 95
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db ICE, PSYCHIC ; type
|
||||
db ICE, PSYCHIC_TYPE ; type
|
||||
db 45 ; catch rate
|
||||
db 137 ; base exp
|
||||
db ICE_BERRY, ICE_BERRY ; items
|
||||
|
@@ -3,7 +3,7 @@
|
||||
db 40, 35, 30, 105, 120, 70
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db PSYCHIC, PSYCHIC ; type
|
||||
db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
|
||||
db 100 ; catch rate
|
||||
db 145 ; base exp
|
||||
db NO_ITEM, NO_ITEM ; items
|
||||
|
@@ -3,7 +3,7 @@
|
||||
db 106, 90, 130, 110, 90, 154
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db PSYCHIC, FLYING ; type
|
||||
db PSYCHIC_TYPE, FLYING ; type
|
||||
db 3 ; catch rate
|
||||
db 220 ; base exp
|
||||
db NO_ITEM, NO_ITEM ; items
|
||||
|
@@ -3,7 +3,7 @@
|
||||
db 100, 100, 100, 100, 100, 100
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db PSYCHIC, PSYCHIC ; type
|
||||
db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
|
||||
db 45 ; catch rate
|
||||
db 64 ; base exp
|
||||
db NO_ITEM, MIRACLEBERRY ; items
|
||||
|
@@ -3,7 +3,7 @@
|
||||
db 106, 110, 90, 130, 154, 90
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db PSYCHIC, PSYCHIC ; type
|
||||
db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
|
||||
db 3 ; catch rate
|
||||
db 220 ; base exp
|
||||
db NO_ITEM, BERSERK_GENE ; items
|
||||
|
@@ -3,7 +3,7 @@
|
||||
db 40, 45, 65, 90, 100, 120
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db PSYCHIC, PSYCHIC ; type
|
||||
db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
|
||||
db 45 ; catch rate
|
||||
db 136 ; base exp
|
||||
db NO_ITEM, MYSTERYBERRY ; items
|
||||
|
@@ -3,7 +3,7 @@
|
||||
db 40, 50, 45, 70, 70, 45
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db PSYCHIC, FLYING ; type
|
||||
db PSYCHIC_TYPE, FLYING ; type
|
||||
db 190 ; catch rate
|
||||
db 73 ; base exp
|
||||
db NO_ITEM, NO_ITEM ; items
|
||||
|
@@ -3,7 +3,7 @@
|
||||
db 95, 75, 110, 30, 100, 80
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db WATER, PSYCHIC ; type
|
||||
db WATER, PSYCHIC_TYPE ; type
|
||||
db 75 ; catch rate
|
||||
db 164 ; base exp
|
||||
db NO_ITEM, KINGS_ROCK ; items
|
||||
|
@@ -3,7 +3,7 @@
|
||||
db 95, 75, 80, 30, 100, 110
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db WATER, PSYCHIC ; type
|
||||
db WATER, PSYCHIC_TYPE ; type
|
||||
db 70 ; catch rate
|
||||
db 164 ; base exp
|
||||
db NO_ITEM, KINGS_ROCK ; items
|
||||
|
@@ -3,7 +3,7 @@
|
||||
db 90, 65, 65, 15, 40, 40
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db WATER, PSYCHIC ; type
|
||||
db WATER, PSYCHIC_TYPE ; type
|
||||
db 190 ; catch rate
|
||||
db 99 ; base exp
|
||||
db NO_ITEM, KINGS_ROCK ; items
|
||||
|
@@ -3,7 +3,7 @@
|
||||
db 45, 30, 15, 65, 85, 65
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db ICE, PSYCHIC ; type
|
||||
db ICE, PSYCHIC_TYPE ; type
|
||||
db 45 ; catch rate
|
||||
db 87 ; base exp
|
||||
db ICE_BERRY, ICE_BERRY ; items
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user