atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11420 commits 2 branches 40 tags 600 MiB
Commit graph

357 commits

Author SHA1 Message Date
ultima-soul
9c5ec33aa7 Sync Crown Tundra and renamed moves Battle Engine defines. 2021-01-12 14:22:33 -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
sbird
95665c24b4 [pokemon_expansion] define missing items from ITEM_EXPANSION for gEvolutionTable 2021-01-10 18:30:15 +01: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
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
LOuroboros
91c92e9c04 #if X_ITEMS_REWORK == TRUE -> #ifdef BATTLE_ENGINE 2021-01-04 06:49:18 -03:00
surskitty
aa9796a6ae Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip. 2020-12-31 18:57:36 -05:00
amiosi
6c5852c4e0 colors n stuff 2020-12-31 13:13:10 -05:00
amiosi
2e5575385a pr commit 2020-12-30 20:27:37 -05: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
ghoulslash
6f05ef01ac
Merge pull request #1306 from ExpoSeed/galar-mon-flags 
Add Galarian Form mon flags
 2020-12-21 10:05:19 -07: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
LOuroboros
c496e0ce6c Tweaked the X Items' effects' entries in src/data/pokemon/item_effects.h 2020-12-08 18:27:03 -03:00
ghoulslash
66ed10a826
Merge pull request #1251 from ExpoSeed/PE-mon-flags 
Add mon flags
 2020-12-03 15:07:17 -05:00
LOuroboros
1083130125 Another one 
Made Crabrawler evolve in the Ice Room of the Shoal Cave too.
 2020-11-25 10:42:57 -03: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
d817950fb6 Readded the EVO_MAP based Eevee->Leafeon and Eevee->Glaceon evos 2020-11-24 23:49:18 -03:00
LOuroboros
210cfabe4c Another one 
In SwSh, Magneton can evolve with a Thunder Stone just like Charjabug
 2020-11-23 11:02:23 -03:00
LOuroboros
e6f44328a1 Commented out parameters 2020-11-23 10:49:32 -03:00
LOuroboros
bb75b1ad17
A few evolution updates 
- Changed the Eevee->Leafeon evo method from EVO_MAP to EVO_ITEM, which is more accurate in comparison as of Gen. 8 since we still don't have the actual evo method implemented.
- Changed the Eevee->Glaceon evo method for the same reason.
- Added Vikavolt's Thunder Stone based evolution as a second option.
 2020-11-23 10:45:00 -03:00
ExpoSeed
4db1f02154 Remove ifdefs for vanilla items 2020-11-16 18:58:11 -06:00
ExpoSeed
c8e3104adc ifdef items in base_stats.h 2020-11-15 11:46:38 -06: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
3981720343 Review changes 4 2020-11-13 16:36:31 -03:00
Eduardo Quezada D'Ottone
b2f078410f Review changes 2 2020-11-13 16:13:13 -03:00
LOuroboros
47c0a38401 Added Rayquaza's Mega Evolution to the list of evolutions 2020-11-11 15:19:56 -03:00
Eduardo Quezada D'Ottone
dbd02d1857 Fixed defines. 2020-11-10 20:05:01 -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
Eduardo Quezada D'Ottone
cb6802f01e Standarized naming schemes. 2020-11-06 20:15:28 -03:00
Eduardo Quezada D'Ottone
b494b6e987 Fixing Litleo's and Pyroar's gender ratio. 2020-11-06 14:28:10 -03: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
Eduardo Quezada D'Ottone
c598daf228 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-FixTrapinchAbility 
# Conflicts:
#	src/data/pokemon/base_stats.h
 2020-11-02 19:39:18 -03:00
Eduardo Quezada D'Ottone
910d502df2 Review changes 2020-11-01 19:23:45 -03:00
Eduardo Quezada D'Ottone
014afea3df Fixed Trapinch's evolutions abilities. 2020-11-01 16:59:03 -03:00
Eduardo Quezada D'Ottone
44e066cdb4 Fixed missing abilities. 2020-11-01 15:37:01 -03:00
Eduardo Quezada D'Ottone
2c3d4ec7c7 Moved P_UPDATED_STATS ifs to above typing. 2020-11-01 15:32:50 -03:00
Eduardo Quezada D'Ottone
ad5b728967 Fixed Quick Feet BATTLE_ENGINE define. 2020-11-01 14:50:08 -03:00
Eduardo Quezada D'Ottone
56056c01f4 Fixed identation for real. 2020-11-01 14:45:41 -03:00
Eduardo Quezada
2c098d8294 Merge branch 'pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	src/data/pokemon/base_stats.h
 2020-10-26 20:06:37 -03:00
Eduardo Quezada
641daafb3f Fixed identation for better readability. 2020-10-25 12:34:48 -03:00
Eduardo Quezada
13a6b70e8c Updating Egg Groups. 2020-10-24 08:04:30 -03:00
Eduardo Quezada
67817ff9b9 Updated abilities. 2020-10-24 07:58:58 -03:00
Eduardo Quezada
1358197af4 Forms. 2020-10-24 07:41:49 -03:00
Eduardo Quezada
e3699ba30a Megas 2020-10-24 07:35:28 -03:00
Eduardo Quezada
f54d866900 Alola Mons 2020-10-24 07:31:09 -03:00
Eduardo Quezada
f8206f8286 Kalos Mon amie. 2020-10-24 07:07:16 -03:00
Eduardo Quezada
ba299cb3fb Unova Mon 2020-10-24 06:56:47 -03:00
Eduardo Quezada
97be3674cd Sinnoh Mon 2020-10-24 06:06:18 -03:00
Eduardo Quezada
545b3bf128 Hoenn mon 2020-10-24 05:25:13 -03:00
Eduardo Quezada
0a8c5e2134 Johto mon 2020-10-24 04:46:45 -03:00
Eduardo Quezada
fa037b14b7 Kanto mon 2020-10-24 04:34:50 -03:00
Eduardo Quezada
5489e55276 Merge branch 'pokemon_expansion' into PR-CommentGen4Abilities 2020-10-24 00:45:52 -03:00
Eduardo Quezada D'Ottone
353f9eca42
Merge pull request #30 from AsparagusEduardo/PE-PokemonConfig 
Updated types and stats in configuration file.
 2020-10-23 12:40:10 -03:00
Eduardo Quezada
92728a1875 Added Ultimasoul's Forms from his FromID system. 2020-10-23 11:44:47 -03:00
Eduardo Quezada D'Ottone
38573ab402
Merge pull request #16 from LOuroboros/deoxys 
Added the data of Deoxys' forms
 2020-10-22 00:52:40 -03:00
ExpoSeed
1a024b0826
Merge pull request #12 from AsparagusEduardo/PR-TradeSpecificEvo 
Added Karrablast/Shelmet evolution method.
 2020-10-16 20:55:15 -05:00
Eduardo Quezada
2b95f9fc43 Updated types and stats in config. 2020-10-16 21:04:11 -03:00
Eduardo Quezada
1d76144e19 Commented out Gen 4+ abilities in base_stats.h 2020-10-16 17:05:34 -03:00
LOuroboros
16f4fda35b Tweaked EVO_MAP evolutions 
The EVO_MAP evolution method was using numerical IDs instead of proper labels, which wasn't intuitive.
On top of that, there were better maps to choose for some of the species that made use of it.
 2020-10-15 06:35:37 -03:00
Eduardo Quezada
34ce08db0b Added Karrablast/Shelmet evolution method. 2020-10-14 20:16:18 -03:00
ExpoSeed
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -05:00
ExpoSeed
bc4e992be2 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-pokemon-expansion 2020-10-11 00:10:12 -05:00
ExpoSeed
8b83d88e75 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-item-expansion 2020-10-11 00:07:10 -05:00
GriffinR
65a4e06737 Add ITEM6_HEAL constants, change move flags to shifts 2020-10-05 18:48:51 -04:00
ExpoSeed
c3113b43bb Merge branch 'item_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-item-expansion 2020-10-04 02:36:07 -05:00
ExpoSeed
5794fc69e8 Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-pokemon-expansion 2020-10-04 02:35:23 -05:00
ExpoSeed
227d2dce32 Make description slightly more precise 2020-09-16 12:51:14 -05:00
ExpoSeed
778e6925de Complete TMHM Learnset description 2020-09-16 12:36:11 -05:00
LOuroboros
30cd540888 Implemented the level up learnsets of Deoxys' forms, thanks to UltimaSoul 2020-07-23 13:05:38 -03:00
LOuroboros
a3cc1a2edc Added the base stats of Deoxys' forms, thanks to UltimaSoul 2020-07-23 13:04:01 -03:00
Eduardo Alvaro Quezada D'Ottone
db94e3c065
Removed empty evYields for SpAttack. (#471) 2020-07-22 23:39:08 +02:00
LOuroboros
383872ca92
Added the data of Zygarde's forms (#477) 
* Defined species for Zygarde's 10% and Complete forms

* Defined the sprites for Zygarde's 10% and Complete forms

* Added coordinates and entries for the forms of Zygarde in the sprite data tables

* Set the InGame names of Zygarde's forms

* Added the base stats of Zygarde's forms

* Set the level up learnsets for the forms of Zygarde

* Defined the paths for the sprites of Zygarde's forms

* Linked the icons to the species of Zygarde's forms

* Added the icons of Zygarde's forms

* Fixed fuckups and inserted the icons of Zygarde's forms

* Added the cries of Zygarde's forms

* Tweaked the Y coordinate of Zygarde's 10% form's backsprite
 2020-07-22 23:37:47 +02:00
DizzyEggg
e03fea84d0 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-07-11 12:46:41 +02:00
Eduardo Quezada
9a2bac5ecd USUM level up movesets. 
Commented out Gen4+ moves.
 2020-06-24 19:19:09 -04:00
Eduardo Quezada
fb73f7333a Set evolution methods closer to the actual games. 2020-06-13 02:37:29 -04:00
DizzyEggg
013f9b6a17 merge wiith masteer and summary screen change 2020-05-29 12:50:54 +02:00
Eduardo Alvaro Quezada D'Ottone
c2b51cf17a
Added missing Primal/Mega Weather Trio base stats. (#376) 
* Added missing Mega Rayquaza Base Stats.

* Added Primal Kyogre/Groudon's missing base stats.
 2020-05-24 10:21:49 +02:00
AsparagusEduardo
179d84dcd7 Using ability constants for OLD_UNOWN stats 2020-05-16 18:08:56 -04:00
AsparagusEduardo
f6932518b0 Ordered OLD_UNOWN in the same way as the other base stats. 2020-05-03 00:00:01 -04:00
LOuroboros
cda92e066a
Remove Zygarde from src/data/pokemon/evolution.h (#357) 
Zygarde doesn't evolve into anything. It definitely doesn't evolve into nothing at Lv100, lol.
 2020-04-29 09:05:28 +02:00
DizzyEggg
c8ba013539 Power Herb 2020-04-22 10:44:19 +02:00
DizzyEggg
633ebe6148 Schooling 2020-04-21 20:43:47 +02:00
DizzyEggg
d5307c3e54 Poison Touch 2020-04-19 14:24:31 +02:00
DizzyEggg
6a3944d27c Frisk, would be easier if it didnt scan 2 opponents 2020-04-19 13:37:56 +02:00
DizzyEggg
1395a7d382 Loafing Around bug fix 2020-04-18 13:04:28 +02:00
DizzyEggg
a2813e63de Slow Start 2020-04-18 12:52:15 +02:00
Eduardo Alvaro Quezada D'Ottone
e232f6bf03
Fix for Dark Type in party evolution. (#329) 2020-04-16 09:07:31 +02:00
LOuroboros
a387121e4a
Restored the .noFlip parameter to src/data/pokemon/base_stats.h (#325) 
* Restored the .noFlip parameter of src/data/pokemon/base_stats.h

* A few noFlip tweaks
 2020-04-15 19:38:19 +02:00
DizzyEggg
6968124529 Merge battle anim documentation 2020-02-29 13:59:41 +01:00
DizzyEggg
f2760e3083 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-02-29 09:47:14 +01:00
GriffinR
b1d131ace2 Convert base_stats.h to UTF-8 2020-02-25 12:46:03 -06:00
Eduardo Alvaro Quezada D'Ottone
70ebc6b55b
Lycanroc forms (#268) 
* Midnight Lycanroc

* Dusk Lycanroc
 2020-02-22 23:42:16 +01:00
Eduardo Alvaro Quezada D'Ottone
bb10a69f81
Busted Mimikyu (#254) 
* Busted Mimikyu

* Fixed back sprite coords.
 2020-02-08 19:32:01 +01:00
Eduardo Alvaro Quezada D'Ottone
98867f0cb3
Dex Text Fixes (#253) 
- Fixed decap error in Eevee's Pokédex text.
- Fixed missing decap in Mew's Pokédex text.
 2020-02-08 15:52:25 +01:00
DizzyEggg
62755e2501 Fix Eevee evolutions no ability 2020-01-18 20:42:04 +01:00
DizzyEggg
044f070020 Merge with master 2020-01-18 15:04:56 +01:00
LOuroboros
d1d3ca5312 Various Forms Data (#226) 
* Defined species for Shaymin's Sky Form and Giratina's Origin Form

* Defined the sprites for Shaymin's and Giratina's forms

* Added coordinates and entries for the forms of Shaymin and Giratina in the sprite data tables

* Set the InGame names for Shaymin's and Giratina's forms

* Added the base stats of Shaymin's and Giratina's forms

* Set the level up learnsets for the forms of Shaymin and Giratina

* Defined the paths of the sprites for the forms of Shaymin and Giratina

* Linked the icons to the species of Shaymin's and Giratina's forms

* Added the sprites of Shaymin's Sky Form and Giratina's Origin Form

* Added the icons of Shaymin's and Giratina's forms

* Fixed silly mistakes.

* Alright, fixed silly mistakes. For good now.

* Added the data for a lot of Pokémon's forms.
-Darmanitan Zen Mode
-Tornadus, Thundurus and Landorus Therian Forms
-Meloetta Pirouette Form
-Aegislash Blade Form
-Hoopa Unbound Form
-Minior Core Form
-Wishiwashi School Form

* Added the sprites of the Pokémon forms that were just inserted

* Added the sprites for the Black and White Forms of Kyurem
 2020-01-01 15:07:56 +01:00
DizzyEggg
4c9ea32d19 Merge with master 2019-12-30 18:52:23 +01:00
DizzyEggg
f228764545 Remove duplicate Rockruff egg moves 2019-12-30 14:07:31 +01:00
DizzyEggg
89a2ee5be6 Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-12-30 13:54:25 +01:00
DizzyEggg
cd4c3b38b5 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-12-30 13:53:59 +01:00
Pokestia
e4731b1289 Pokemon expansion (#211) 
* Define species Meltan and Melmetal

Also shifted a few other species numbers

* Define Meltan and Melmetal Sprites

* Add Meltan and Melmetal coordinates and table entries

* Set Meltan and Melmetal ingame names

* Add Meltan and Melmetal base stats

* Add Meltan and Melmetal level up learnsets

* Set Meltan and Melmetal TM learnset

It is still blank because LGPE TMs don't match USUM TMs

* Define Meltan and Melmetal sprite paths

* Add Meltan and Melmetal sprite, icon and front animation

* Fix typo in bas stats

* Add Meltan and Melmetal pokedex entries

* Tab to space learnsets

* Tab to space pokedex text

This includes all mons with tabs in their dex entries.
 2019-12-30 13:48:50 +01:00
GriffinR
749965d56b Document item_use.c 2019-12-21 21:39:30 -05:00
LOuroboros
060a3566e2
Swapped the item number ID for the actual name of the item in Lopunny-to-Mega Lopunny's evolution method. 
Title.
Every single other Mega Evolution is defined with their item's name. Why would this be an exception?
 2019-12-19 22:50:52 -03:00
DizzyEggg
1a5c610b5c
Merge pull request #206 from LOuroboros/alolan_forms 
Alolan Forms
 2019-11-30 15:35:12 +01:00
LOuroboros
ad7cda9169 Replaced the level up learnsets of the Alolan Forms with the same placeholder that many other new Pokémon use. 2019-11-30 09:29:30 -03:00
DizzyEggg
dcb5d16cb3 Merge with master 2019-11-29 21:47:31 +01:00
DizzyEggg
7ff3f32a95 Merge 2019-11-29 21:05:44 +01:00
DizzyEggg
6e06b08c94 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2019-11-29 20:55:23 +01:00
AJ Fontaine
2d1a780dd8
Fix Hondrew Berry typo 2019-11-28 11:44:13 -05:00
GriffinR
63ee15fc28 Document Frontier Util 2019-11-25 18:37:48 -06:00
GriffinR
fc3783b739 WIP Document apprentice 2019-11-16 12:28:49 -05:00
LOuroboros
884f542798 Fixed a typo and added entries for the Alolan Forms in src/pokemon.c 2019-11-13 14:29:26 -03:00
LOuroboros
f47bc95990 Set the TM/HM learnsets for the Alolan Forms. 2019-11-12 22:38:13 -03:00
LOuroboros
788efccf79 Set the level up learnsets for the Alolan Forms. 2019-11-12 19:04:06 -03:00
LOuroboros
05013586d7 Set the evolution conditions for the Alolan Forms. 2019-11-12 18:25:28 -03:00
LOuroboros
1791ec28c9 Set the egg moves for the Alolan Forms. 2019-11-12 17:26:54 -03:00
LOuroboros
fecc6737e0 Added the Alolan Forms' base stats. 2019-11-12 16:58:44 -03:00
DizzyEggg
ab2de0342b
Merge pull request #201 from AsparagusEduardo/PokedexOrders 
Updated Alphabetical, Weight and Height orders.
 2019-11-10 16:50:20 +01:00
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
DizzyEggg
4c462a726e Merge with master and learnsets 2019-10-06 15:57:33 +02:00
DizzyEggg
cb6bafcb7f Merge with master 2019-10-06 14:40:12 +02:00
Eduardo Quezada D'Ottone
e52eb48929 Updated Alphabetical, Weight and Height orders. 2019-09-29 09:55:34 -03:00
GriffinR
6ab192e739 Review changes for #807 2019-09-17 16:50:17 -05:00
GriffinR
aac9658a8e Document some field_specials data 2019-09-17 16:50:17 -05:00
LOuroboros
64ec9f4d03 Fixed the 2 Nidoran having the wrong egg move learnset in egg_moves.h 2019-09-16 17:16:02 -03:00
DizzyEggg
51bfdffac3 Ability Capsule 2019-08-17 12:47:25 +02:00
Gamer2020
d2ac94f1e4 Fixing commented out item names. 2019-08-16 18:38:41 -04:00
PikalaxALT
71dff6dbf1 Remove unnecessary tutor learnset casts 2019-07-10 16:38:05 -04:00
DizzyEggg
9e175c9f1b Merge branch 'master' into battle_engine_v2 2019-06-10 11:21:16 +02:00
DizzyEggg
fffeefd0e2
Merge pull request #159 from LOuroboros/patch-2 
Update base_stats.h
 2019-06-09 11:50:12 +02:00
LOuroboros
68b744b3e4
Update base_stats.h 
Corrected the label of the Razor Claw in 3 instances, so people can comment things out more easily.
 2019-06-07 08:25:15 -03:00
LOuroboros
7cb5ebcb8d
Update evolution.h 
Fixed a typo and corrected the label of the Shiny and Dusk Stones in 2 instances, so people can comment things out more easily.
 2019-06-07 08:14:16 -03:00
DizzyEggg
1c60387968 Merge with master, placeholder back anims 2019-06-03 11:24:10 +02:00
DizzyEggg
0eaddd251c Merge branch 'master' into item_expansion 2019-06-03 11:06:09 +02:00
DizzyEggg
c81d06b712 Fix EV wings 2019-06-03 11:05:03 +02:00
DizzyEggg
a074f36766 USE PROTAG 2019-05-25 08:26:40 -05:00
DizzyEggg
e706280503 Rename PKMN TRAINER CALSS 4 2019-05-25 08:26:40 -05:00
DizzyEggg
ad6093f5bc Merge with master, fix conflicts 2019-05-17 10:15:30 +02:00
DizzyEggg
f22f7866ac Merge with master, fix conficts 2019-05-17 09:52:20 +02:00
DizzyEggg
ca51bc23bf Merge branch 'master' into item_expansion 2019-05-17 09:36:35 +02:00
DizzyEggg
4ae1e014bc Change abilities in base stats to array 2019-05-16 17:09:43 -05:00
DizzyEggg
26e4b52fe8 Dummy learnsets for forms 2019-05-16 10:16:00 +02:00
DizzyEggg
6367269ce9 Add dummy learnsets 2019-05-15 13:47:33 +02:00
DizzyEggg
38b320eaa5 Data for hidden abilities 2019-05-14 13:20:10 +02:00
DizzyEggg
c0470c3932 Remove skarmory mega evo 2019-05-03 17:31:23 +02:00
DizzyEggg
d0f91a996d Tweak up mega evo 2019-05-02 23:10:01 +02:00
DizzyEggg
bbe3a28b78 Merge with master 2019-05-01 11:10:41 +02:00
LOuroboros
c5f6f5e588 Renamed X Special to X Special Attack and added the item data for Old Gateau and X Special Defense. 2019-04-30 13:06:08 -03:00
LOuroboros
8e3f2d1e2d Sweet Heart and Big Malasada data. 2019-04-30 12:38:51 -03:00
DizzyEggg
2d670fa803 Rotom forms and meowstic female 2019-04-23 13:00:40 +02:00
DizzyEggg
0666da6145 Merge branch 'master' into pokemon_expansion 2019-04-22 14:12:18 +02:00
DizzyEggg
f1e420ff69 Move tutor and tms compatibility for all mons 2019-04-22 14:10:40 +02:00
DizzyEggg
50eeddfec6 Evolution stone item effects 2019-04-17 13:05:19 +02:00
DizzyEggg
896d99f919 Merge with master 2019-04-17 12:58:05 +02:00
DizzyEggg
b4e1375bb6 Document pokemon item effects 2019-04-16 11:23:09 -05:00
DizzyEggg
4e5c543327 Remove new items data from battle engine 2019-04-13 14:02:04 +02:00
DizzyEggg
b3b74c2534 Longer dex entries thx MrDollSteak 2019-04-07 18:20:57 +02:00
DizzyEggg
ac5473f990 Mega Evo Base stats 2019-04-07 15:14:16 +02:00
DizzyEggg
51bb713aef Add Burmy Wormadam form gfx and data 2019-04-07 14:39:11 +02:00
DizzyEggg
b21d960c5c Add Egg Moves data 2019-04-03 23:09:07 +02:00
DizzyEggg
7dcd7362d3 Add Evolution data 2019-04-03 23:00:49 +02:00
DizzyEggg
27bafdc04d Begin pokemon expansion 2019-04-02 21:22:16 +02:00
DizzyEggg
f415871369 Merge with master 2019-02-03 10:44:05 +01:00
Diegoisawesome
d64a905d65 Document trainer backsprites 2019-02-02 15:56:22 -06:00
Kurausukun
c3126df436
Prevent Skarmory from Evolving via Level 2019-01-28 00:49:26 -05:00
DizzyEggg
517573eb4b Update with master 2018-12-26 17:46:51 +01:00
DizzyEggg
8833004d41 space 2018-12-24 23:29:47 +01:00
DizzyEggg
44e5e82f67 clean up party menu 2018-12-24 23:27:20 +01:00
DizzyEggg
442b1826a2 asm party and fldeff clean-up 2018-12-24 21:59:05 +01:00
DizzyEggg
6fa5f33519 Merge branch 'master' into battle_engine_v2 2018-12-24 09:07:18 +01:00
Rangi
78bab9ca0c Fix OLD_UNOWN_BASE_STATS formatting: tabs->spaces, and comma outside the macro 2018-12-23 17:24:10 -05:00
DizzyEggg
e54dd6a02b Merge with master 2018-12-22 13:53:07 +01:00
ShinyDragonHunter
c120a446ad Moved macro to the top of base_stats.h 2018-12-21 10:37:35 +00:00
ShinyDragonHunter
c489bb88b7 Updated macro name to be less vague 2018-12-20 13:59:00 +00:00
ShinyDragonHunter
51e5be68de Use a macro for OLD_UNOWN base stats 2018-12-20 11:28:19 +00:00
DizzyEggg
180aa839c4 Fix conflicts 2018-12-09 13:12:02 +01:00
nullableVoidPtr
f50faac244 Clean more tables 2018-12-08 14:10:30 +08:00
DizzyEggg
470df386c9 Fix conflicts 2018-12-07 23:01:14 +01:00
Melody
2615ece23b Use normal apostrophes like adults 2018-12-07 10:41:08 -05:00
DizzyEggg
0d122bc831 Fix merge conflicts 2018-12-03 17:56:36 +01:00
DizzyEggg
846b5d79e4 Get rid of headers in src/data 2018-12-03 16:10:41 +01:00
DizzyEggg
a83fc52a7e Make data easier to edit 2018-12-03 14:49:16 +01:00
Melody
2779421ad4 fix brendan/may/wally consistency issues 2018-12-03 08:01:52 -05:00
Melody
eeb6446da4 add more consistent names 2018-12-02 22:36:09 -05:00
Melody
72bd670ba6 index trainer class lookups 2018-12-02 22:35:31 -05:00
DizzyEggg
8f8e6fb88b Merge branch 'master' into battle_engine_v2 2018-12-02 16:59:38 +01:00
Melody
b9cf4f27b5 renames the winstrate graphics names to pokefan 2018-12-02 00:47:04 -05:00
DizzyEggg
7fa55704b2 merge with master 2018-11-30 20:46:09 +01:00
Slawter666
deb7adbad5 Convert pokédex data to C 2018-11-27 04:00:38 +00:00
Kurausukun
690f2671cb oops, forgot Igglybuff 2018-11-25 05:54:32 -05:00
Kurausukun
13ea841e32 change pokemon types to use fairy type 2018-11-24 21:16:32 -05:00