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

320 Commits

Author SHA1 Message Date
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
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
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
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
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
SonikkuA-DatH
f0aee1f8d3
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2 2022-12-18 17:50:39 -08: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
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
Bassoonian
06ab4fc842 Update move flags 2022-12-04 21:56:40 +01:00
Bassoonian
4ac1e4fc61 Power Shift is now a clone of Power Trick 2022-11-19 13:41:56 +01:00
Bassoonian
4da9ecbcea Prepare FLAG_SLICING_MOVE for merger with abilities branch 2022-11-18 22:37:31 +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
Eduardo Quezada
44bf4a15e3 Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald 
# Conflicts:
#	include/constants/battle_config.h
#	include/constants/battle_move_effects.h
 2022-11-04 12:19:40 -03:00
Eduardo Quezada
edf4e45c4d Config for Dark Void being only usable by Darkrai 2022-11-03 21:36:12 -03:00
BuffelSaft
6035c5a280 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-10-22 14:31:13 +13:00
Eduardo Quezada
77f24d42e4 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/reworkScald 
# Conflicts:
#	include/constants/battle_config.h
 2022-10-07 15:39:02 -03:00
Eduardo Quezada
dfdfb72365 Separate config for updated move types 2022-09-26 07:50:43 -03:00
Eduardo Quezada
720cb249d6 Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/reworkScald 
# Conflicts:
#	include/constants/battle_config.h
 2022-09-16 12:06:06 -03:00
Eduardo Quezada
77696ca686 Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change 2022-09-16 10:31:02 -03:00
Eduardo Quezada
de32940fdf Further removed trailing whitespaces 2022-09-13 16:26:36 -03:00
LOuroboros
cc86b2fd96 Added Z-Move stats for LA's moves 2022-08-30 20:29:36 -03:00
LOuroboros
c167e2c6cc Added Legends: Arceus' move data 2022-08-30 19:32:44 -03:00
ghoulslash
462a144956
Merge pull request #2200 from AsparagusEduardo/BE_ZMove_power 
Updated Z-Move power for Gen 8 moves and moves with power varying by Gen
 2022-07-20 18:10:31 -04:00
Eduardo Quezada D'Ottone
f00beac3f9 Updated Z-Move power for Gen 8 moves and moves with power varying by Gen 2022-07-20 11:32:16 -04:00
Eduardo Quezada D'Ottone
e14afd8957 Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5. 2022-07-20 10:33:18 -04:00
ghoulslash
6b84a9f0b3 merge w be 2022-07-17 12:40:43 -04:00
LOuroboros
cec7e30ef1
Update battle_moves.h 2022-07-15 01:51:36 -03:00
BuffelSaft
bb25746e05 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-05-13 22:40:43 +12:00
BuffelSaft
8693db632b Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-05-07 12:27:20 +12:00
sneed
60d7d8f97e Initial Commit 2022-05-03 03:38:44 +03:00
ExpoSeed
f50a406b18 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2022-03-22 12:56:23 -05:00
BuffelSaft
9d1800f53e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-01-27 17:18:51 +13:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine 2021-12-23 15:29:10 -08:00
ExpoSeed
d6747527da Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-12-16 21:44:01 -06:00
SonikkuA-DatH
ec596cf9b2
Update battle_moves.h 
Not sure why it works better with User than "All targets"
 2021-11-28 19:58:18 -08:00
BuffelSaft
d2eb5f0e61 Remove shell trap effect code 
Left strings and animations as those were fine, but code was non-functional and fixing it was not trivial.
 2021-11-22 14:46:47 +13:00
BuffelSaft
42b8f18cb1 Remove Corrosive Gas code 
This was not working at all in testing, so it can be done by a separate PR later.
 2021-11-22 14:35:01 +13:00
BuffelSaft
70f0018c08 Partially implement Shell Trap 
Doesn't play the animation when the trap triggers, but kinda works? May also be incredibly buggy, but I'm not interested in working on this move any further.
 2021-11-22 14:14:41 +13:00
ultima-soul
3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00