AgustinGDLV
5d508f7963
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-03-24 22:40:51 -07:00
AgustinGDLV
038649594a
finished G-Max Move tests
2023-03-22 22:31:08 -07:00
AgustinGDLV
a3c8b97a6c
added tests for status1/status2 effects + bug fixes for them
2023-03-22 20:18:25 -07:00
AgustinGDLV
6233627a57
more tests + fixed hp reversion issues
2023-03-22 17:04:05 -07:00
May8th1995
9ec31c61bf
Fixes weirdly set value for eject buttons etc ( #2846 )
...
* Fixes weirdly set value for eject buttons etc
* Remove known fialing from fixed test
---------
Co-authored-by: tennis <May8th1995@users.noreply.github.com>
2023-03-21 20:12:46 +01:00
AgustinGDLV
69fd63a922
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-03-21 09:56:58 -07:00
AgustinGDLV
5a9e1de836
Merge branch 'RHH/pr/feature/formBattleChange' of https://github.com/AsparagusEduardo/pokeemerald into dynamax
2023-03-20 21:14:33 -07:00
AgustinGDLV
7d70222770
added most Dynamax immunities/interactions + tests + fixed some move selection bugs
2023-03-20 16:40:05 -07:00
LOuroboros
f4e8389779
Added Psyblade and Hydro Steam
2023-03-17 09:25:39 -03:00
Eduardo Quezada
7ce68994ec
Made Mega Evolution properly use TryBattleFormChange
2023-03-12 02:32:09 -03:00
AgustinGDLV
b708da3998
Merge branch 'RHH/pr/feature/formBattleChange' of https://github.com/AsparagusEduardo/pokeemerald into dynamax
2023-03-11 00:17:30 -08:00
AgustinGDLV
4293dc8a24
not entirely confident implementation of Dynamax indicator
2023-03-10 23:03:51 -08:00
AgustinGDLV
ec4b330b9b
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-03-10 21:00:41 -08:00
AgustinGDLV
06bf934b02
Dynamaxed pokemon now have increased HP
2023-03-10 20:38:17 -08:00
AgustinGDLV
76073fab52
added basic Dynamax-in-battle
2023-03-10 10:20:27 -08:00
AgustinGDLV
7de7599a7b
reworked scripts to remove jumpifnotally / jumpiftargetabsent
2023-03-07 12:07:11 -08:00
Eduardo Quezada
4625a46748
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
...
# Conflicts:
# src/battle_interface.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
2023-03-07 11:26:33 -03:00
Eduardo Quezada D'Ottone
81a80e566c
Refactor Mega Evolution indicator sprite ( #2805 )
2023-03-07 08:06:28 -03:00
DizzyEggg
a04046dbb6
Add tests for Defog and fix Defog battle strings ( #2737 )
...
* start working on defog tests
* defog tests + improve terrain end battlescripts
* newline
2023-03-06 20:35:08 +01:00
DizzyEggg
306c4565a0
merge
2023-03-06 15:32:28 +01:00
ghoulslash
dec1b16138
Swallow/Spit Up Gen 5 Behavior and tests for Swallow/Spit Up/Stockpile ( #2790 )
2023-03-05 09:50:47 -05:00
ghoulslash
4e138fa4b7
Fix wrong Contrary message when affected by Intimidate ( #2723 )
2023-03-02 09:38:00 -05:00
AgustinGDLV
7c853ef45e
implemented G-Max Sweetness, Overgrowth, One Blow, Rapid Flow, and Finale
2023-02-28 16:37:48 -08:00
AgustinGDLV
3cdcf2a356
implemented G-Max Chi Strike, finished G-Max Gold Rush
2023-02-27 22:01:19 -08:00
AgustinGDLV
da24b717e4
implemented all status1 and status2 G-Max Moves: Befuddle, Volt Crash, Malodor, Stun Shock, Gold Rush, Cuddle, Terror, Meltdown, Smite
2023-02-27 21:26:03 -08:00
AgustinGDLV
0908129c84
implemented G-Max Gravitas, G-Max Snooze, G-Max Depletion; Spite works on Max Moves
2023-02-27 18:43:06 -08:00
AgustinGDLV
93d8efd51f
implemented G-Max Resonance
2023-02-27 14:34:08 -08:00
DizzyEggg
c92a65dc40
Add config for stockpile raising def stats
2023-02-27 21:09:02 +01:00
AgustinGDLV
92c8503869
reorganized max move functionality to remove redundant move effects
2023-02-27 11:54:49 -08:00
DizzyEggg
3338a6b786
add messages for stockpile effects wear off
2023-02-27 12:31:29 +01:00
AgustinGDLV
e537be76ea
Z-moves bypass protection ( #2730 )
2023-02-27 09:17:07 +01:00
AgustinGDLV
a36c35aea1
implemented G-Max Vine Lash, G-Max Wildfire, G-Max Cannonade, G-Max Volcalith
2023-02-26 23:35:36 -08:00
AgustinGDLV
4d19659b0b
implemented G-Max Stonesurge, G-Max Steelsurge
2023-02-26 22:02:06 -08:00
Eduardo Quezada
41bf9ea63c
Removed trailing whitespaces
2023-02-26 18:43:15 -03:00
DizzyEggg
4bdca43dbd
refactor mega evolution indicator sprite
2023-02-26 12:51:35 +01:00
AgustinGDLV
503aad9137
fixed tests
2023-02-25 15:57:57 -08:00
AgustinGDLV
b4ec273353
Merge branch 'upcoming' into dynamax
2023-02-25 14:04:55 -08:00
ghoulslash
827bf11307
Merge pull request #2660 from DizzyEggg/ace_voltswitch
...
Fix Volt Switch / Roar with ace pokemon
2023-02-23 09:20:18 -05:00
AgustinGDLV
38f462551f
pulled rhh master, i hate merge conflicts
2023-02-22 18:50:54 -08:00
DizzyEggg
dc83708443
Remove unused script BattleScript_TargetAbilityStatRaiseOnMoveEnd
2023-02-22 22:51:59 +01:00
DizzyEggg
877e3fd6af
merge with upcoming
2023-02-22 19:27:42 +01:00
DizzyEggg
460dceb48b
fix intimidate derp
2023-02-22 19:20:18 +01:00
DizzyEggg
83281944fa
Add tests for Contrary
2023-02-22 16:24:27 +01:00
DizzyEggg
e0b76e98ff
Add MOVE_SHELL_TRAP Effect ( #2716 )
...
* implemented Shell Trap
Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>
2023-02-22 13:55:34 +00:00
DizzyEggg
64e26f5c86
Fix Contrary String on Intimidate
2023-02-22 13:11:16 +01:00
Jaizu
403a6f4544
Merge pull request #2712 from DizzyEggg/fix_abilities_empty_field
...
Fix switch-in abilities activating on an empty field
2023-02-22 09:49:13 +01:00
DizzyEggg
31138455de
remove unneeded VARIOUS_JUMP_IF_NO_VALID_TARGETS
2023-02-22 09:28:12 +01:00
AgustinGDLV
87a9150134
added base functionality for max moves
2023-02-21 20:16:25 -08:00
DizzyEggg
d73ab0246f
Fix Explosion + Galvanize + Volt Absorb and Mind Blown ( #2688 )
...
* Fix Explosion and Mind Blown
* Use battler ability in jumpifabilitypresent
2023-02-21 22:50:29 +00:00
Eduardo Quezada
5ca9213d07
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
...
# Conflicts:
# src/battle_script_commands.c
2023-02-21 17:47:02 -03:00