Commit Graph

1645 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Bassoonian
06ab4fc842 Update move flags 2022-12-04 21:56:40 +01:00
Bassoonian
c14fa82f43 Fix Headlong Rush description 2022-12-04 18:14:27 +01:00
Bassoonian
051ad7bf69 Update src/data/text/move_descriptions.h
Co-Authored-By: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-12-04 00:26:05 +01:00
LOuroboros
653364fd71 Added the basic data for the Gen. 9 Abilities 2022-12-02 23:01:22 -03:00
Eduardo Quezada
e858b4e709 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124
# Conflicts:
#	include/battle.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_dome.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/battle_tower.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
2022-11-24 15:36:00 -03:00
Bassoonian
4ac1e4fc61 Power Shift is now a clone of Power Trick 2022-11-19 13:41:56 +01:00
GriffinR
4736b4b14d
Merge pull request #1810 from AsparagusEduardo/pret/pr/baseStatsRename
Renamed gBaseStats to gSpeciesInfo
2022-11-18 17:45:23 -05:00
Bassoonian
4da9ecbcea Prepare FLAG_SLICING_MOVE for merger with abilities branch 2022-11-18 22:37:31 +01:00
Bassoonian
4034f18c0e Update PLA descriptions 2022-11-18 22:30:40 +01:00
Bassoonian
739680e425 Victory Dance effect 2022-11-18 22:23:34 +01:00
Bassoonian
29ae22183b Mystical Power effect 2022-11-18 22:17:08 +01:00
Bassoonian
9512b3a57a Implement Double Shock functionality with temporary string 2022-11-18 22:12:26 +01:00
Bassoonian
a250341e6c Forgot to reset Wicked Torque effect rate 2022-11-18 22:00:46 +01:00
Bassoonian
3ac3cb249e Wicked Torque effect 2022-11-18 22:00:21 +01:00
Bassoonian
d4c92a0a19 Fix Bitter Malice's effect 2022-11-18 21:54:46 +01:00
Bassoonian
ed33f2b9ce Change PLA moves to SV effects 2022-11-18 20:56:25 +01:00
Bassoonian
e279185152 Update move data to GEN9 (with config) 2022-11-18 12:22:15 +01:00
Bassoonian
f7d1a12d2d Data entry for gen9 moves 2022-11-18 12:15:44 +01:00
LOuroboros
7260478c54 Uncommented level up moves 2022-11-11 01:31:22 -03:00
Eduardo Quezada
f2d0e547ac Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030
# Conflicts:
#	src/rom_header_gf.c
2022-11-09 19:54:44 -03:00
GriffinR
e434b0047f More missing constant usage 2022-11-09 15:53:47 -05:00
GriffinR
1d1c2d41bb Add list menu cursor constants 2022-11-09 15:16:46 -05:00
GriffinR
b3e75138da Sync wireless improvements 2022-11-09 15:14:18 -05:00
BuffelSaft
1da4eb3b14
Merge pull request #2428 from AsparagusEduardo/RHH/pr/feature/DarkVoid
Config for Dark Void being only usable by Darkrai
2022-11-05 22:42:51 +13:00
Eduardo Quezada
d23b5c95c9 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/monAnimations
# Conflicts:
#	src/data/pokemon_graphics/front_pic_anims.h
#	src/pokemon.c
2022-11-03 23:31:20 -03:00
Eduardo Quezada
edf4e45c4d Config for Dark Void being only usable by Darkrai 2022-11-03 21:36:12 -03:00
Eduardo Quezada D'Ottone
b8371500d3
Merge pull request #1676 from BuffelSaft/multistrike
Multi-hit refactor and Parental Bond
2022-11-01 21:16:04 -03:00
ghoulslash
53061c7d62
Merge pull request #2391 from AsparagusEduardo/RHH/pr/sugardoodoodoodoodoodooaahhoneyhoney
Implemented Honey's Sweet Scent functionality
2022-11-01 20:09:30 -04:00