diff options
| author | dannye <33dannye@gmail.com> | 2023-11-21 20:56:28 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-21 20:56:28 -0600 |
| commit | 04f7f7f506a1dbb877e4678601261e8157fd0e57 (patch) | |
| tree | bfe62d3872c5f031ee40df9488910bd58b0e1b15 /constants | |
| parent | Extend tools/pcm.c to allow decoding .pcm to .wav (diff) | |
| parent | Fix some map text constants (diff) | |
| download | pokeyellow-04f7f7f506a1dbb877e4678601261e8157fd0e57.tar.gz pokeyellow-04f7f7f506a1dbb877e4678601261e8157fd0e57.tar.xz pokeyellow-04f7f7f506a1dbb877e4678601261e8157fd0e57.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/battle_anim_constants.asm | 8 | ||||
| -rw-r--r-- | constants/battle_constants.asm | 9 | ||||
| -rw-r--r-- | constants/item_constants.asm | 8 | ||||
| -rw-r--r-- | constants/pokemon_data_constants.asm | 9 |
4 files changed, 22 insertions, 12 deletions
diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm new file mode 100644 index 00000000..db57d6c4 --- /dev/null +++ b/constants/battle_anim_constants.asm @@ -0,0 +1,8 @@ +; AnimationTypePointerTable indexes (see engine/battle/animations.asm) + const_def 1 + const ANIMATIONTYPE_SHAKE_SCREEN_VERTICALLY ; 1 + const ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_HEAVY ; 2 + const ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_SLOW ; 3 + const ANIMATIONTYPE_BLINK_ENEMY_MON_SPRITE ; 4 + const ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_LIGHT ; 5 + const ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_SLOW_2 ; 6 diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index 3e53e194..90f4c3d3 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -1,15 +1,20 @@ DEF MAX_LEVEL EQU 100 +; maximum moves known per mon DEF NUM_MOVES EQU 4 +; significant stat values +DEF BASE_STAT_LEVEL EQU 7 +DEF MAX_STAT_LEVEL EQU 13 + ; VitaminStats indexes (see data/battle/stat_names.asm) - const_def + const_def 1 const STAT_HEALTH const STAT_ATTACK const STAT_DEFENSE const STAT_SPEED const STAT_SPECIAL -DEF NUM_STATS EQU const_value +DEF NUM_STATS EQU const_value - 1 ; StatModTextStrings indexes (see data/battle/stat_mod_names.asm) const_def diff --git a/constants/item_constants.asm b/constants/item_constants.asm index b6f0e7c9..e55ee89c 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -28,9 +28,9 @@ const SUPER_POTION ; $13 const POTION ; $14 const BOULDERBADGE ; $15 +DEF SAFARI_BAIT EQU BOULDERBADGE ; overload const CASCADEBADGE ; $16 -DEF SAFARI_BAIT EQU $15 ; overload -DEF SAFARI_ROCK EQU $16 ; overload +DEF SAFARI_ROCK EQU CASCADEBADGE ; overload const THUNDERBADGE ; $17 const RAINBOWBADGE ; $18 const SOULBADGE ; $19 @@ -52,13 +52,13 @@ DEF SAFARI_ROCK EQU $16 ; overload const DOME_FOSSIL ; $29 const HELIX_FOSSIL ; $2A const SECRET_KEY ; $2B - const UNUSED_ITEM ; $2C "?????" + const ITEM_2C ; $2C const BIKE_VOUCHER ; $2D const X_ACCURACY ; $2E const LEAF_STONE ; $2F const CARD_KEY ; $30 const NUGGET ; $31 - const PP_UP_2 ; $32 + const ITEM_32 ; $32 const POKE_DOLL ; $33 const FULL_HEAL ; $34 const REVIVE ; $35 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 028d6711..5cc2d344 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -79,12 +79,9 @@ DEF HOF_TEAM_CAPACITY EQU 50 ; Evolution types const_def 1 - const EV_LEVEL ; 1 - const EV_ITEM ; 2 - const EV_TRADE ; 3 - -DEF MAX_EVOLUTIONS EQU 3 -DEF EVOLUTION_SIZE EQU 4 + const EVOLVE_LEVEL ; 1 + const EVOLVE_ITEM ; 2 + const EVOLVE_TRADE ; 3 ; wMonHGrowthRate values |