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,802 Commits 1 Branch 0 Tags
Commit Graph

1642 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
92f0f6f820 Fixed Psychic Fangs power 2021-10-04 20:20:00 -03:00
ultima-soul
7f5204a09f
Merge pull request #1691 from AsparagusEduardo/item_sitrus 
Sitrus Berry Gen4+ heal. Credit to SBird1337
 2021-10-04 15:18:12 -07:00
Eduardo Quezada D'Ottone
fd9b2eddbe
Update src/data/items.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-10-04 19:05:47 -03:00
ultima-soul
78d2215196 Improve and refactor some form change code. Separated out ability checks into their own methods. Change FORM_ITEM_USE_TIME to specify time of day instead of hardcoding. 2021-10-03 10:16:09 -07:00
ultima-soul
50ab03e9c1 Assign FORM_ITEM_USE constants to secondaryId for appropriate items. 2021-10-03 09:39:26 -07:00
GriffinR
6e62c057f5 Document remaining symbols in pokemon.c 2021-10-02 23:48:12 -04:00
Eduardo Quezada D'Ottone
76bdbf164e Updated sound flags for Howl and Heal Bell 2021-10-02 20:00:00 -03:00
Eduardo Quezada D'Ottone
57ea20bc6d Implemented modern effect of struggle with config 2021-10-02 13:32:36 -03:00
Eduardo Quezada D'Ottone
fdd284b50b Hold Item party menu 2021-09-29 02:06:03 -03:00
Eduardo Quezada D'Ottone
c3087de712 Fixed Coba Berry's typing 2021-09-28 22:13:39 -03:00
ultima-soul
de35894669 Enable Mental Herb description toggling based on B_MENTAL_HERB config. 2021-09-27 14:26:07 -07:00
Eduardo Quezada D'Ottone
ff24b15241 derp 2021-09-27 00:00:24 -03:00
Eduardo Quezada D'Ottone
91feaecb04 Hold effect update 2021-09-26 23:45:39 -03:00
ghoulslash
761006a164 merge with be 2021-09-26 19:19:32 -04:00
Eduardo Quezada D'Ottone
4fbe4da7d0 Sitrus Berry Gen4+ heal. Credit to SBird1337 2021-09-26 18:46:34 -03:00
LOuroboros
234f3290c3 Added a day time exclusive equivalent to FORM_USE_ITEM 
Primarily for Shaymin, since it can only change its form with the Gracidea during the day.
Special thanks to AsparagusEduardo.
 2021-09-25 22:00:10 -03:00
LOuroboros
a49676ab55 Set the right holdEffectParam to the terrain seeds 2021-09-25 21:09:38 -03:00
LOuroboros
813d114132 Synced include/constants/hold_effects.h with the BE 2021-09-25 20:58:07 -03:00
GriffinR
42d2fefe02
Merge branch 'master' into tag-none 2021-09-24 10:17:34 -04:00
Syreldar
4c05520bf3 Fixed Retaliate's naming. 2021-09-24 16:02:26 +02:00
GriffinR
a6ab2eb883
Merge branch 'master' into trailingSpaces 2021-09-23 21:39:21 -04:00
BuffelSaft
530998c4b7 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2021-09-23 16:41:35 +12:00
BuffelSaft
2f03ac31b9 Multihit refactor and Parental Bond 
Port multihit system from the CFRU, implement Parental Bond, refactor certain moves as required and implement all remaining multi hit moves except Dragon Darts.
 2021-09-23 14:31:21 +12:00
Eduardo Quezada D'Ottone
707d49242e
Revert "Scald thaw flag config for Gen 5" 2021-09-22 12:31:23 -03:00
Eduardo Quezada D'Ottone
53d985eedd Scald thaw flag config for <Gen 5 2021-09-22 10:29:32 -03:00
Eduardo Quezada D'Ottone
3ef87ec722
Merge pull request #1416 from ExpoSeed/IE/item-use-form-change 
Support form changes with PE
 2021-09-22 00:05:11 -03:00
Eduardo Quezada D'Ottone
f9d1375451
Merge pull request #1375 from ExpoSeed/PE/form-change-table 
Form change table
 2021-09-22 00:04:26 -03:00
LOuroboros
afc55994a9 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into gen5_2nd_frames 2021-09-21 20:45:17 -03:00
Eduardo Quezada D'Ottone
08d3c31abe
Merge pull request #1584 from Blackforest92/pokemon_expansion 
Port missing Gen8 icons from DPE
 2021-09-20 22:48:57 -03:00
ghoulslash
136fbb5862 fix swapped descs 2021-09-20 21:33:50 -04:00
ghoulslash
0ea6c65b83 merge with be 2021-09-17 09:10:09 -04:00
ghoulslash
9d8672e3df merge with be 2021-09-16 13:12:59 -04:00
ghoulslash
aac7ae3595 add MOVE_TARGET_ALL_BATTLERS 2021-09-16 10:45:33 -04:00
ghoulslash
b85586a33a merge with be 2021-09-15 12:54:39 -04:00
GriffinR
f8f7617946 Add TAG_NONE 2021-09-14 13:14:14 -04:00
BuffelSaft
db928a1329 Data entry for new sprites 
Add sprite defines, entries to gender tables, etc.
 2021-09-11 14:12:41 +12:00
GriffinR
cbf8863e5b Clean up Lilycove Lady 2021-09-09 15:24:34 -04:00
BuffelSaft
a4b630e6b5 Fix MOVE_EFFECT_REMOVE_STATUS 
Wake-Up Slap and Sparkling Aria now print the correct message when the target is cured.

Also, fix Ice Hammer's effect chance.
 2021-09-07 16:34:32 +12:00
DizzyEggg
b0a1153a2b
Merge pull request #1600 from LOuroboros/gen6_footprints 
Added footprints for Gen. 6 species
 2021-09-06 10:36:46 +02:00
DizzyEggg
67fd379771
Merge pull request #1632 from BuffelSaft/hammer-arm 
Fix Hammer arm's effect chance
 2021-09-06 10:16:47 +02:00
BuffelSaft
4c8a12006c Fix Hammer Arm's effect chance 2021-09-06 19:45:30 +12:00
ghoulslash
3066e09e68 decap pokemon in mental herb 2021-09-04 08:43:33 -04:00
ghoulslash
f682e409f0 update mental herb desc 2021-09-04 08:19:57 -04:00
ghoulslash
e475813799 revert mental herb desc 2021-09-04 08:18:38 -04:00
ghoulslash
933696b3cd merge with be 2021-09-03 17:41:00 -04:00
BuffelSaft
7d251c39f7 Correct Liquidation and Sparkling Aria 
Liquidation is affected by Sheer Force, Sparkling Aria should hit both foes and ally.
 2021-09-02 16:05:36 +12:00
ExpoSeed
0f99d9d4c6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-08-30 13:26:40 -05:00
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files 
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
 2021-08-24 19:59:32 -03:00
LOuroboros
87461db04d Added missing 2nd frames for Gen. 5 species 
Also made certain Pokémon such as Zebstrika or Galvantula use their 2nd frame.
 2021-08-23 08:28:58 -03:00
LOuroboros
5c1d7e52dc Added footprints for Gen. 6 species 2021-08-23 06:28:10 -03:00