ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-17 11:08:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,488 Commits 1 Branch 0 Tags
Commit Graph

275 Commits

Author SHA1 Message Date
GriffinR
64fc585cc3 Document pokenav ribbons summary screen 2021-02-18 11:33:55 -05:00
ultima-soul
46e853c13b Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-02-03 16:23:23 -08:00
ultima-soul
daf5e0167e Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-02-03 16:06:48 -08:00
amiosi
a021204389 oricorio pau constants 2021-02-02 14:49:01 -05:00
amiosi
f700004188 proper CamelCase 2021-02-02 14:21:00 -05:00
amiosi
47e1d6b790 MIMEJR -> MIME_JR 2021-02-02 12:36:05 -05:00
ExpoSeed
857fc9ce95
Merge pull request #1320 from amiosi/item_expansion 
update item effects, prices, names & descriptions
 2021-01-28 12:15:11 -06:00
Evan
8ef6a2c80d merge with be 2021-01-13 14:23:30 -07:00
ultima-soul
9c5ec33aa7 Sync Crown Tundra and renamed moves Battle Engine defines. 2021-01-12 14:22:33 -08:00
amiosi
7e91129332 may as well do the rest 2021-01-11 20:18:23 -05:00
amiosi
eaca987879 more fixes 
light ball and gen 6 evolution held items
 2021-01-11 19:54:41 -05:00
amiosi
3aadd69303 fixes 
pokeblock berries and evolution items
 2021-01-11 19:49:03 -05:00
surskitty
f58539b602 Renaming the last two and fixing the merge conflict with PE. 2021-01-10 15:48:57 -05:00
surskitty
a96179a308 Changed Neutralizing Gas. 2021-01-02 17:16:44 -05:00
Evan
0c648c0071 merge with be 2021-01-01 08:34:09 -07: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
2e5575385a pr commit 2020-12-30 20:27:37 -05: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
ffa35a33c1 Review corrections 2020-12-19 07:44:34 -03:00
ultima-soul
c675c92a1d Add Gen 8 Pokemon data. 2020-12-16 12:57:36 -08: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
Evan
e70e2bcd65 merge with be 2020-12-14 09:09:51 -07:00
LOuroboros
0ac026e6ca Added the data of SwSh's Crown Tundra's moves 
And Dragon Energy's effect. Eerie Spell's is the only one missing out of this bunch.
 2020-12-11 20:49:23 -03:00
Evan
a0ae0ece53 add ultranecrozium-z and update z crystal data 2020-12-08 09:55:50 -07:00
Evan
8a56a52666 update z crystal descriptions 2020-12-01 17:49:43 -05:00
Evan
2bfc7ea9b1 merge upstream 2020-12-01 15:42:04 -05:00
Evan
539a88207e add z crystal and z ring 2020-11-29 10:00:03 -05:00
Evan
348d70b309 z move indicator and some data 2020-11-26 15:56:18 -05:00
ultima-soul
63bd0ec836 Remove Cacophony and fix some Gen 8 ability descriptions to fit. 2020-11-16 15:42:09 -08:00
ultima-soul
e32659d4bb Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities. 2020-11-16 13:50:26 -08:00
ghoulslash
686ff59b11
Merge pull request #13 from AsparagusEduardo/PR-LGPE_IOA_Moves 
LGPE & Isle of Armor move data.
 2020-11-15 08:29:10 -07:00
Eduardo Quezada D'Ottone
afeb0c5ae4 Fixed Greninja form species names. 2020-11-14 09:10:16 -03:00
Eduardo Quezada D'Ottone
f0154028ff Review changes 2 2020-11-14 09:01:43 -03:00
Eduardo Quezada D'Ottone
b2f078410f Review changes 2 2020-11-13 16:13:13 -03:00
Eduardo Quezada D'Ottone
e87f0f1ddb Review changes 2020-11-13 14:51:50 -03:00
Eduardo Quezada D'Ottone
cb6802f01e Standarized naming schemes. 2020-11-06 20:15:28 -03:00
LOuroboros
93d9ad0997
Fixed the descriptions of Freeze Dry and Flying Press 
Addresses https://github.com/DizzyEggg/pokeemerald/issues/508
 2020-11-06 15:24:00 -03:00
Evan
6c39977a8d HGSS supereffective change 2020-11-01 15:16:51 -07:00
Evan
9ad9dbff9f fix ability descriptions 2020-11-01 09:22:28 -07:00
Eduardo Quezada
2964cc3828 Filled missing form names. 2020-10-26 22:53:31 -03:00
LOuroboros
c2502b0bf5 Review corrections 2020-10-24 15:44:40 -03:00
LOuroboros
c2f278bde3 Corrections to various items 
-Fixed the Honey's sprite thanks to Blackforest
-Corrected many items' descriptions (with feedback from the bois at RHH's Discord server)
-Added missing items data
 2020-10-24 09:41:19 -03:00
LOuroboros
15345fb401 Fixed the Honey's sprite and description 2020-10-24 06:26:30 -03:00
Eduardo Quezada
ae60ae8a2d Review changes. 2020-10-24 03:07:45 -03:00
Eduardo Quezada
b5834b617d Merge branch 'BattleEngine' into PR-LGPE_IOA_Moves 
# Conflicts:
#	src/data/text/move_descriptions.h
 2020-10-24 00:36:29 -03:00
Eduardo Quezada
92728a1875 Added Ultimasoul's Forms from his FromID system. 2020-10-23 11:44:47 -03:00
Evan
f7c3b3e246 reformat oval charm description 2020-10-19 16:07:04 -06:00