Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,937 Commits 1 Branch 0 Tags
Commit Graph

2310 Commits

Author SHA1 Message Date
GriffinR
9003966fcc Misc field_specials cleanup 2023-02-01 11:48:55 -05:00
ghoulslash
2b58593e33
Merge pull request #2595 from AsparagusEduardo/RHH/pr/data/Gen9Items 
Added some Gen9 item data and fixed Punching Glove's effect
 2023-01-27 16:13:50 -05:00
Eduardo Quezada D'Ottone
4c4fa6a2b6
Merge pull request #2603 from TeamAquasHideout/upcoming 
Fix Wood Hammer To Have 1/3rd Recoil
 2023-01-27 10:47:32 -03:00
Team Aqua's Hideout
e87e8d0898
Fix Wood Hammer To Have 1/3rd Recoil 
Wood Hammer was set to 1/4th recoil before
 2023-01-27 08:16:37 -05:00
Eduardo Quezada
3288309c43 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_script_commands.c
 2023-01-25 19:57:19 -03:00
Eduardo Quezada
a044774896 Added Gen9 item data and fixed Punching Glove's effect 2023-01-24 16:47:54 -03:00
GriffinR
7681340966 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-trade 2023-01-23 14:45:51 -05:00
ghoulslash
321634ed3b
Silk Trap Effect (#2512) 
* add silk trap effect, analog of obstruct

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-01-23 16:42:47 -03:00
Eduardo Quezada D'Ottone
fbcad9d3ec
Merge pull request #2572 from rh-hideout/AsparagusEduardo-patch-1 
Fixed Exp Candy S using the XS description
 2023-01-23 15:00:25 -03:00
Eduardo Quezada
749225ace1 Matching merge from upstream pret 
# Conflicts:
#	graphics/interface/menu_info.png
#	include/pokemon.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_mons.c
#	src/battle_anim_water.c
#	src/battle_controller_opponent.c
#	src/battle_gfx_sfx_util.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c
 2023-01-20 12:31:54 -03:00
GriffinR
18384894e0
Merge pull request #1822 from AsparagusEduardo/pret/doc/typesEggGroups 
Made Types and Egg Groups into arrays
 2023-01-15 00:27:20 -05:00
Eduardo Quezada
70d59d6aa9 Improve Easy Chat documentation 2023-01-15 02:15:11 -03:00
Eduardo Quezada D'Ottone
6e1981369b
Fixed Exp Candy S using the XS description 2023-01-13 13:22:27 -03:00
Eduardo Quezada
ac4825ad28 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_util.c
 2023-01-13 11:50:47 -03:00
GriffinR
b873d69679 Sync trade anim 2023-01-09 15:32:04 -05:00
ghoulslash
da27df9f18
Merge pull request #2326 from AsparagusEduardo/RHH/pr/reworkScald 
Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change
 2023-01-08 16:25:29 -05:00
GriffinR
c91b13a12b Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows 2023-01-07 13:30:11 -05:00
Eduardo Quezada D'Ottone
7622d84a4f
Revert "Removed Unown hack" 2023-01-07 11:39:56 -03:00
Eduardo Quezada
d72a3731d4 Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald 
# Conflicts:
#	include/constants/battle_move_effects.h
 2023-01-06 15:25:49 -03:00
Eduardo Quezada D'Ottone
34d27eca0e
Merge pull request #2457 from AsparagusEduardo/RHH/pr/cleanup/unown 
Removed Unown hack
 2023-01-04 18:57:28 -03:00
Eduardo Quezada
74d8c587fe Merge branch 'RHH/upcoming' into RHH/pr/cleanup/unown 
# Conflicts:
#	src/data/pokemon/species_info.h
#	src/data/pokemon_graphics/front_pic_anims.h
 2023-01-04 17:58:54 -03:00
Eduardo Quezada
55be15f690 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2 
# Conflicts:
#	include/config/pokemon.h
 2023-01-04 16:19:57 -03:00
Eduardo Quezada
a23501a4a3 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_script_commands.c
 2023-01-02 18:54:57 -03:00
LOuroboros
0a00942a26 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1 2023-01-02 16:00:13 -03:00
LOuroboros
13d8c0d167 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2023-01-02 14:34:24 -03:00
Eduardo Quezada
16e8a5dd7f Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	include/battle_util.h
 2023-01-01 16:02:40 -03:00
LOuroboros
e8dfb66c30 Adding ability effect triggers for terrains and weather 
A new, probably better way to handle the announcement trigger that abilities such as Protosynthesis and Quark Drive have, when the battle weather or the field terrain change.

Misc. changes:
-EFFECT_DAMAGE_SET_TERRAIN -> EFFECT_HIT_SET_REMOVE_TERRAIN
 -It's more appropriate as the effect can be used to force set a terrain or simply to remove an active terrain, after all.
 -The main reason for the rename was the inconsistency with the battle script's label.
-Reverted accidentally committed change to B_DOUBLE_WILD_CHANCE, performed back in c8abf00c.
 2022-12-30 03:25:16 -03:00
LOuroboros
0159065dea Removed Shell Trap 
It's time to let it go for my own mental sanity.
Besides, it's a Gen. 7 move. I shouldn't have added it here.
 2022-12-28 07:51:11 -03:00
Eduardo Quezada
d103025527 Merge branch 'RHH/upcoming' into RHH/pr/feature/palleteConversion2 
# Conflicts:
#	include/config/pokemon.h
 2022-12-22 10:30:01 -03:00
LOuroboros
4bb86c5d96 Implemented Barb Barrage's effect 2022-12-21 19:48:50 -03:00
LOuroboros
1229fa752a Fixed Triple Axe's target, added its effect and fixed Ceaseless Edge's 2022-12-21 19:48:49 -03:00
LOuroboros
2cb9400ef0 Implemented Dire Claw's effect 2022-12-21 19:48:48 -03:00
LOuroboros
3ce4869766 Implemented Shell Trap's effect 2022-12-21 19:48:10 -03:00
LOuroboros
ae482ed1f4 Implemented Ceaseless Edge's effect 2022-12-21 19:47:00 -03:00
Eduardo Quezada
c0d4e14a61 Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald 
# Conflicts:
#	include/config/battle.h
#	include/constants/battle_move_effects.h
 2022-12-21 12:46:09 -03:00
LOuroboros
6153b8e904 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2022-12-20 07:11:36 -03:00
Eduardo Quezada
1580f892a5 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	include/constants/pokemon.h
#	src/battle_script_commands.c
 2022-12-19 18:53:26 -03:00
SonikkuA-DatH
6a2a026c70
Update battle_anim.h 
Added required tags
 2022-12-18 22:23:51 -08:00
SonikkuA-DatH
5682247ace
Add files via upload 
Base upload. Need to apply Teatime changes...
 2022-12-18 19:14:54 -08:00
SonikkuA-DatH
b97a68656c
Delete battle_anim.h 
Need to replace with current...
 2022-12-18 19:14:01 -08:00
SonikkuA-DatH
f0aee1f8d3
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2 2022-12-18 17:50:39 -08:00
Eduardo Quezada
c03f354dca Finished cleaning up the animations to the new standard 2022-12-16 20:58:41 -03:00
Eduardo Quezada
6a57dcdc4c Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20221216 
# Conflicts:
#	src/data.c
#	src/data/pokemon_graphics/front_pic_anims.h
 2022-12-16 19:19:23 -03:00
GriffinR
347a02ace1 Sync trade 2022-12-15 15:40:59 -05:00
LOuroboros
a56cfd1aa7 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2022-12-12 19:55:48 -03:00
ghoulslash
e3e0d60222
Merge pull request #2467 from Bassoonian/gen9moves 
Generation IX Moves
 2022-12-11 14:47:47 -05:00
Eduardo Quezada
2f96344cd9 Removed ANIM_CMD macro from unused_anims.h 2022-12-10 11:46:41 -03:00
LOuroboros
3c30e6bdc3 Implemented Sharpness' effect 2022-12-06 05:23:30 -03:00
LOuroboros
4dc44150c5 Implemented Wind Rider's effect 2022-12-06 05:23:29 -03:00
Eduardo Quezada
2d694a84e3 Trying to fix remote reference 2022-12-05 21:57:28 -03:00