ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-16 18:48:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,145 Commits 1 Branch 0 Tags
Commit Graph

1693 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
f2c509eab7
Merge pull request #2151 from Sneed69/dummy_abilities 
Add dummy abilities to make base stats header smaller
 2022-05-22 13:27:27 -04:00
sneed
587b056ccb add dummy abilities to PE 2022-05-22 19:55:09 +03:00
sneed
5b0afffd91 popup and flower gift description fixes 2022-05-22 13:10:51 +03:00
BuffelSaft
16570e8c3f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-05-22 12:55:55 +12:00
GriffinR
593e2c9be0 Fix inconsistent static s/g names 2022-05-17 14:00:02 -04:00
AgustinGDLV
01665c0213 reverted todo for dynamax candy 2022-05-16 13:52:38 -07:00
AgustinGDLV
0de15db564 clean-up 2022-05-16 13:26:26 -07:00
AgustinGDLV
793e8ef5a4 fixed learning moves 2022-05-16 13:12:41 -07:00
AgustinGDLV
03c21c3b71 implementation of EXP candies 2022-05-15 21:28:23 -07:00
BuffelSaft
bb25746e05 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-05-13 22:40:43 +12:00
LOuroboros
52d6c96e69 Merge branch 'master' of https://github.com/pret/pokeemerald into pePretMerge 2022-05-13 03:20:42 -03:00
LOuroboros
12d956872b Merge branch 'master' of https://github.com/pret/pokeemerald into iePretMerge 2022-05-13 03:18:37 -03:00
LOuroboros
2263caef7a Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine 2022-05-13 03:17:31 -03:00
Eduardo Quezada D'Ottone
a896f9aed7
Merge pull request #2133 from Sneed69/cobaberry 
Coba berry fix
 2022-05-12 13:39:50 -04:00
sneed
0c0bea33c7 Update items.h 2022-05-12 18:39:10 +03:00
LOuroboros
5b1c31bbc9
Update tutor_learnsets.h 2022-05-10 12:39:36 -03:00
Eduardo Quezada D'Ottone
b6922a1dab
Merge branch 'pokemon_expansion' into evo_overworld 2022-05-09 16:36:34 -04:00
AgustinGDLV
54163240d8 implemented toggelable cancellation / multi-evo 2022-05-08 20:55:29 -07:00
sneed
eebfed20ad #elif 2022-05-08 09:58:06 +03:00
sneed
d8256663e3 fix syntax 2022-05-07 22:12:10 +03:00
sneed
5592fa434a catch < gen7 with engine 2022-05-07 22:01:35 +03:00
sneed
7008c01f25 Update items.h 2022-05-07 21:41:21 +03:00
ghoulslash
0172f84617
Merge pull request #2070 from AsparagusEduardo/PE_evoData 
Updated missing evolution and form change data
 2022-05-07 11:37:11 -04:00
Eduardo Quezada D'Ottone
4e7ce0b663 Merge branch 'battle_engine' into BE_configs 
# Conflicts:
#	include/constants/battle_config.h
 2022-05-07 10:25:34 -04:00
BuffelSaft
8693db632b Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-05-07 12:27:20 +12:00
AgustinGDLV
03c48b4f3f compatibility with evo_battle 2022-05-05 15:46:53 -07:00
AgustinGDLV
7d42f93861 added special overworld evo changes 2022-05-05 11:55:31 -07:00
Eduardo Quezada D'Ottone
49905cee04 Ability Patch 2022-05-03 14:14:04 -04:00
sneed
60d7d8f97e Initial Commit 2022-05-03 03:38:44 +03:00
ghoulslash
f0d74b60ff
Merge pull request #1932 from BuffelSaft/gen_8_moves_batch2 
Gen 8 moves batch + Beak Blast
 2022-05-01 07:47:11 -04:00
ghoulslash
166b16d22c
Merge pull request #2091 from AsparagusEduardo/PE_LegendaryIV 
Config for Legendaries, Mythicals and Ultra Beasts to have at least 3 perfect IVs
 2022-04-27 08:48:22 -04:00
ghoulslash
29d8ed9602
Merge pull request #2083 from AsparagusEduardo/BE_moveDesc 
Adjusted description of Glacial Lance and Astral Barrage
 2022-04-27 08:46:48 -04:00
ghoulslash
fccd4d14b1
Merge pull request #2085 from AsparagusEduardo/PE_PokemonJump 
Added Pokémon Jump data.
 2022-04-27 08:45:35 -04:00
ghoulslash
574be40f26
Merge pull request #2099 from Greenphx9/calyrex_rider_icons 
Calyrex Rider Icons
 2022-04-27 08:43:53 -04:00
BuffelSaft
5358cc0a00 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-04-25 13:38:13 +12:00
Greenphx9
b3294c60a2 Calyrex Rider Icons 2022-04-22 16:31:17 +10:00
GriffinR
fc5747f0f7
Merge pull request #1649 from GriffinRichards/clean-trainer 
Trainer hill clean up
 2022-04-20 00:20:44 -04:00
Eduardo Quezada D'Ottone
84d713a50f Legendary and Mythical flags 2022-04-14 18:44:20 -04:00
TheXaman
2fa812df26 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into rhh_master_merge 2022-04-13 20:51:35 +02:00
LOuroboros
446bcd3181 Merge branch 'master' of https://github.com/pret/pokeemerald into pePret 2022-04-11 01:23:18 -03:00
LOuroboros
eb1834ce84 Merge branch 'master' of https://github.com/pret/pokeemerald into iePret 2022-04-11 01:22:48 -03:00
LOuroboros
b6e2945072 Merge branch 'master' of https://github.com/pret/pokeemerald into bePret 2022-04-11 01:22:10 -03:00
Eduardo Quezada D'Ottone
5fc72c2bfe Heights and weights in Pokédex Orders lists 2022-04-09 22:40:36 -04:00
garakmon
3fe423a6f4 use json for region map sections 
- update nlohmann/json and pantor/inja in tools/
  - create new inja template
 2022-04-04 23:32:03 -04:00
Eduardo Quezada D'Ottone
d604d99d6e Adjusted description of Glacial Lance and Astral Barrage 2022-04-03 16:54:07 -04:00
Eduardo Quezada D'Ottone
dafb5ca74d Fixed trapping moves not reflecting the configured turn config 2022-04-03 13:03:53 -04:00
LOuroboros
f82c946ff3 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge 2022-04-03 13:26:27 -03:00
LOuroboros
af2f70e000 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge 2022-04-03 13:21:40 -03:00
LOuroboros
fa39dc76dc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
GriffinR
328b925a08 Move trainer hill map data to bin files 2022-03-31 14:08:31 -04:00