amiosi
3aadd69303
fixes
...
pokeblock berries and evolution items
2021-01-11 19:49:03 -05:00
Evan
4912bc1d25
Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion
2021-01-11 17:15:41 -07:00
ultima-soul
3cb09b6507
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into deoxys_handling_removal
2021-01-11 15:19:11 -08:00
Philipp AUER
b5fa0129d5
[pokemon-expansion] Changes as requested by code review
...
Update include/constants/pokemon_config.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update include/constants/pokemon_config.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update include/constants/pokemon_config.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update include/constants/pokemon_config.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update include/constants/pokemon_config.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update include/constants/pokemon_config.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update src/data/pokemon/evolution.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update src/data/pokemon/evolution.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update src/data/pokemon/evolution.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-01-11 21:43:00 +01:00
surskitty
f58539b602
Renaming the last two and fixing the merge conflict with PE.
2021-01-10 15:48:57 -05:00
surskitty
a0f1dcb9cf
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine
2021-01-10 15:40:21 -05:00
amiosi
8d7d819cde
beast ball cannot be sold
2021-01-10 15:08:48 -05:00
sbird
95665c24b4
[pokemon_expansion] define missing items from ITEM_EXPANSION for gEvolutionTable
2021-01-10 18:30:15 +01:00
Evan
e748db8ef4
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
2021-01-10 08:58:16 -07:00
LOuroboros
f4d34f70c4
Renamed some X Defend labels to reflect its new name
2021-01-10 01:54:41 -03:00
LOuroboros
db37c4f25c
Review correction to src/data/pokemon/item_effects.h
2021-01-09 21:47:58 -03:00
ultima-soul
767f26b73c
Corrected defines for Item Expansion-introduced items for Gen 8 species data.
2021-01-08 19:06:20 -08:00
SphericalIce
3c2a33b9b2
Use constants for max IVs & the random IV generation flag
2021-01-07 22:13:14 +00:00
amiosi
25e7f36ce9
fix reversed names
2021-01-04 22:12:03 -05:00
amiosi
c83c09fc3a
tabs -> spaces
2021-01-04 22:09:09 -05:00
amiosi
24be2c8c39
fix alolan form movesets
2021-01-04 22:04:51 -05:00
Evan
f21b0140b9
revert to CheckViability and stat change effect viabilities
2021-01-04 19:39:59 -07:00
GriffinR
0ca76fc179
Some decoration labels, use constant for tileset size
2021-01-04 16:27:57 -06:00
GriffinR
039108284d
Clean up gDecorations with gItems format
2021-01-04 16:27:57 -06:00
Evan
5ae1e3c25b
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
2021-01-04 11:43:36 -07:00
LOuroboros
91c92e9c04
#if X_ITEMS_REWORK == TRUE -> #ifdef BATTLE_ENGINE
2021-01-04 06:49:18 -03:00
amiosi
19b82dcf57
tabs -> spaces
2021-01-03 19:12:47 -05:00
amiosi
5392c101d0
tabs
2021-01-03 19:11:24 -05:00
ExpoSeed
7dadcb94b8
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-03 17:14:43 -06:00
surskitty
a96179a308
Changed Neutralizing Gas.
2021-01-02 17:16:44 -05:00
ExpoSeed
10f4b48215
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-01 14:14:51 -08:00
Evan
7f4e936e87
fix z move ordering
2021-01-01 08:49:29 -07:00
Evan
0c648c0071
merge with be
2021-01-01 08:34:09 -07:00
ExpoSeed
208e0abe04
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2020-12-31 18:44:43 -06:00
ExpoSeed
b7b1b26b57
Merge pull request #1289 from LOuroboros/final_gambit
...
Corrected Final Gambit's move data and tweaked its effect
2020-12-31 18:39:00 -06:00
surskitty
aa9796a6ae
Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip.
2020-12-31 18:57:36 -05:00
surskitty
533d9f1c54
Updating move names and ability names.
2020-12-31 18:45:25 -05:00
amiosi
6c5852c4e0
colors n stuff
2020-12-31 13:13:10 -05:00
amiosi
8d1383f0d5
no text
2020-12-30 23:51:08 -05:00
amiosi
556a863ee3
minimize pr (also text)
2020-12-30 22:56:15 -05:00
amiosi
2e5575385a
pr commit
2020-12-30 20:27:37 -05:00
LOuroboros
7049413ce2
Updated the type-enhancing items' boost
2020-12-30 15:59:13 -03:00
LOuroboros
32cb306b85
Tweaked evolution.h
...
Litleo doesn't need to have 2 different evolutions into Pyroar.
2020-12-27 00:10:14 -03:00
ultima-soul
6a0939cd4e
Remove special handling for Deoxys.
2020-12-21 22:39:19 -08:00
ghoulslash
6f05ef01ac
Merge pull request #1306 from ExpoSeed/galar-mon-flags
...
Add Galarian Form mon flags
2020-12-21 10:05:19 -07:00
ghoulslash
a1e3700d10
Merge pull request #1299 from LOuroboros/cacophony
...
Cacophony
2020-12-21 09:47:52 -07:00
Evan
728586de51
make ultranecrozium-z description fit
2020-12-20 16:36:31 -07:00
Evan
d500bd4e2f
fix zring and ultranecrozium descriptions
2020-12-19 22:17:20 -07:00
LOuroboros
0aae069db8
Made Fiery Wrath unaffected by King's Rock
2020-12-19 21:11:17 -03:00
LOuroboros
ffa35a33c1
Review corrections
2020-12-19 07:44:34 -03:00
ExpoSeed
ef6a7fbf43
Add Galarian Form mon flags
2020-12-18 18:25:24 -06:00
LOuroboros
cb9faeed3d
Corrected the ability 1 of Calyrex's forms
...
There isn't an `ABILITY_AS_ONE` defined in the `include/constants/abilities.h` of the battle_engine branch, so this wasn't building a ROM correctly.
https://github.com/rh-hideout/pokeemerald-expansion/blob/pokemon_expansion/src/data/pokemon/base_stats.h#L34158
https://github.com/rh-hideout/pokeemerald-expansion/blob/battle_engine/include/constants/abilities.h#L290
2020-12-18 08:17:49 -03:00
ultima-soul
c675c92a1d
Add Gen 8 Pokemon data.
2020-12-16 12:57:36 -08:00
Evan
916d0416e3
outline AI_CheckGoodMove
2020-12-15 21:57:33 -07:00
LOuroboros
77871c5eda
Dealt with Cacophony
...
By copy-pasting back in the BE's include/constants/abilities.h and commenting out the 2 instances where ABILITY_CACOPHONY is normally used in this branch.
2020-12-14 16:26:00 -03:00