GriffinR
f7a729df30
BUGFIX implies UBFIX
2020-12-13 16:16:48 -05:00
Tim Gates
581306db7b
docs: fix simple typo, redunant -> redundant
...
There is a small typo in include/constants/battle_frontier.h.
Should read `redundant` rather than `redunant`.
2020-12-13 22:14:50 +11:00
GriffinR
81d95b9325
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
LOuroboros
55bc2b4bb9
Corrected small inconsistency in move flag names
2020-12-12 12:18:56 -03:00
Michael Panzlaff
91ccf9e343
fix typo
2020-12-12 13:07:56 +01:00
Michael Panzlaff
f177c736fc
more CgbSound decipher work
2020-12-11 16:33:58 +01:00
Michael Panzlaff
15ff55eee5
use better m4a variable/constant names
2020-12-11 16:33:55 +01:00
Kurausukun
58976ebaa8
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
LOuroboros
8b5a5a1896
Reverted include/constants/abilities.h to vanilla
...
With the new abilities introduced by the battle_engine in src/data/pokemon/base_stats.h behind locked behind that branch's defined label, we don't need to define them in this branch anymore.
2020-12-10 16:38:29 -03:00
GriffinR
f95192ed87
Define terminal species IDs relatively
2020-12-08 00:45:05 -05:00
LOuroboros
ce8f794100
Updated abilities.h
...
Straight up copied from the BE to avoid silly merge conflicts.
2020-12-05 14:57:13 -03:00
ghoulslash
66ed10a826
Merge pull request #1251 from ExpoSeed/PE-mon-flags
...
Add mon flags
2020-12-03 15:07:17 -05:00
ExpoSeed
f2259d7ce1
Remove IS_ULTRA_BEAST
2020-11-24 22:44:00 -06:00
ExpoSeed
3adf316574
Add mon flags
2020-11-24 22:42:42 -06:00
LOuroboros
c4c802162e
A few more evo related changes.
...
-EVO_MAP -> EVO_MAPSEC
-Introduced a new EVO_SPECIFIC_MAP method. Its name is self-explanatory. (Thanks to Pyredrid!)
-Changed the maps where Eevee can evolve into Leafeon and Glaceon to make use of it.
2020-11-25 01:15:19 -03:00
LOuroboros
89f6036e77
Bumped EVOS_PER_MON from 8 to 10
2020-11-24 23:47:07 -03:00
GriffinR
9d056e8656
Move object event pal declarations to graphics
2020-11-23 14:45:16 -05:00
GriffinR
513c7c5f45
Clarify Kecleon objects
2020-11-23 14:42:47 -05:00
GriffinR
bf65c1fb25
Name object event pals/tags
2020-11-23 14:24:48 -05:00
kageru
6f91f7e0e3
Use more constants in Battle Tower code
2020-11-17 17:40:26 +01:00
LOuroboros
890144f153
Defined Isle of Armor moves
...
Straight up copied from the battle_engine branch.
2020-11-15 13:05:49 -03:00
Eduardo Quezada D'Ottone
29c33b908b
Apply suggestions from code review
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2020-11-13 21:34:37 -03:00
Eduardo Quezada D'Ottone
54630ff5a9
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
...
# Conflicts:
# src/data/pokemon/evolution.h
2020-11-13 16:40:31 -03:00
Eduardo Quezada D'Ottone
b2f078410f
Review changes 2
2020-11-13 16:13:13 -03:00
Eduardo Quezada D'Ottone
26db02e95a
Review changes 1
2020-11-13 15:36:36 -03:00
LOuroboros
6f122ac8f8
Defined EVO_MOVE_MEGA_EVOLUTION for BE compatibility
2020-11-11 15:18:39 -03:00
Eduardo Quezada D'Ottone
caf6253ba3
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
...
# Conflicts:
# src/pokemon_icon.c
2020-11-10 19:37:02 -03:00
Eduardo Quezada D'Ottone
d97932c009
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
...
# Conflicts:
# src/pokemon.c
2020-11-10 19:29:50 -03:00
ghoulslash
7a9476323c
Merge pull request #566 from AsparagusEduardo/PE-GenderDifferences
...
Support for Gender Differences
2020-11-10 12:31:03 -07:00
Eduardo Quezada D'Ottone
03c7843e45
Capitalization
2020-11-09 14:52:58 -03:00
Eduardo Quezada D'Ottone
690307dbf9
Updated comment.
2020-11-09 14:49:23 -03:00
Eduardo Quezada D'Ottone
df11b68acb
Moved POKEMON_EXPANSION define to global.h to fix reading from other branches
2020-11-09 12:58:03 -03:00
Eduardo Quezada D'Ottone
68627882a5
Merge remote-tracking branch 'pret/master' into PE-pretSync
2020-11-07 15:00:10 -03:00
Eduardo Quezada D'Ottone
cb6802f01e
Standarized naming schemes.
2020-11-06 20:15:28 -03:00
Eduardo Quezada D'Ottone
5e33281350
Support for gender difference mon icons.
2020-11-06 17:48:03 -03:00
Eduardo Quezada D'Ottone
d7fbaa6cbf
Support for gender palettes.
2020-11-06 17:12:57 -03:00
MCboy
e31158d017
add spaces around - and remove comment from include in battle.h
2020-11-06 23:29:52 +03:30
Eduardo Quezada D'Ottone
3849f7dd5d
Female Eevee backsprite.
2020-11-06 16:45:25 -03:00
MCboy
3b91735e63
use constants for ball throw count
2020-11-06 22:59:46 +03:30
Eduardo Quezada D'Ottone
4d4b111327
Front pic gender differences for Eevee
2020-11-06 16:21:45 -03:00
PikalaxALT
99dd461bef
Merge pull request #1189 from aaaaaa123456789/reverts
...
Undo PokeCodec's PRs and port changes
2020-11-03 09:28:45 -05:00
Eduardo Quezada D'Ottone
0c6dc6abab
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
...
# Conflicts:
# graphics/pokemon/burmy/footprint.png
# graphics/pokemon/gastrodon/footprint.png
# graphics/pokemon/rotom/footprint.png
# graphics/pokemon/shellos/footprint.png
# graphics/pokemon/wormadam/footprint.png
# include/constants/species.h
# src/data/pokemon/base_stats.h
2020-11-03 00:13:51 -03:00
Kurausukun
6545745e59
Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts
2020-11-02 18:43:40 -05:00
Kurausukun
8bf401c227
address comments
2020-11-02 18:43:11 -05:00
ultima-soul
1e283e9dbf
Merge pull request #551 from LOuroboros/gen5_footprints
...
Added footprints for the Gen. 5 species
2020-11-02 10:28:06 -08:00
ultima-soul
104b48986c
Merge pull request #538 from AsparagusEduardo/PE-IsUltraBeast
...
Created macro used to detect Ultra Beasts.
2020-11-02 09:53:28 -08:00
ExpoSeed
d6cbbc71a5
Merge pull request #29 from AsparagusEduardo/PR-CommentGen4Abilities
...
Toggle options for abilities and Egg Groups.
2020-11-01 21:07:24 -06:00
Eduardo Quezada D'Ottone
b372ab1c34
Fixed label for Egg Group config.
2020-11-01 14:50:29 -03:00
LOuroboros
7cf3c256cd
Added footprints for the Gen. 5 species, thanks to Blackforest
2020-11-01 09:44:05 -03:00
GriffinR
be1685c87f
Use constants for menu info icon table
2020-10-29 16:34:33 -04:00
