Commit Graph

409 Commits

Author SHA1 Message Date
Eduardo Alvaro Quezada D'Ottone
90442ffbc2
Battle config options (#243)
* Option to use pre-GenVI critical hit multiplier.

* Clarified the option that multiplies EXP by 1.5 for trainer battles.

* Fixed code style.

* Option to change Burn damage.

* Option to change to Gen 7 paralysis drop.

* Ordered settings.

* Implemented review suggestions.
2020-02-08 09:51:55 +01:00
DizzyEggg
834b7b52d3 Merge with master 2020-02-08 09:38:29 +01:00
GriffinR
27c4329e45 Use friendship event constants 2020-02-04 12:16:15 -06:00
GriffinR
be5d417236 Document some pokenav menu handlers 2020-02-04 08:02:28 -06:00
DizzyEggg
06a9165f75 Fix Ice Body not working 2020-01-18 19:18:57 +01:00
DizzyEggg
bcf6b02a55 Fix Last Resort 2020-01-18 18:57:23 +01:00
Eduardo Alvaro Quezada D'Ottone
000a709363 Gen7 trainer exp multiplier. (#200)
* Gen7 trainer exp multiplier.

* Changed check for TRAINER_BATTLE_MULTIPLIER from "before Gen 7" to "not Gen 7" as requested.
.
2020-01-18 18:29:56 +01:00
DizzyEggg
cafb0c3b6a Fix Surf taking 3 pp 2020-01-04 18:17:26 +01:00
DizzyEggg
39e3b0b740 Form changes layout and Stance Change Aegi 2019-12-31 19:11:53 +01:00
DizzyEggg
b15f0b3bb3 Comatose 2019-12-31 16:36:53 +01:00
DizzyEggg
77842b0376 Contact moves for Aftermath and Bestow for Unburden 2019-12-25 12:19:09 +01:00
ultima-soul
332aa80a33 Resolve review comments and encapsulate Unburden check and set. 2019-12-23 09:25:26 -08:00
ultima-soul
5786745d15 Merge branch 'battle_engine' into unburden 2019-12-23 09:01:16 -08:00
DizzyEggg
ea9109943d Aurora Veil now only works in Hail 2019-12-23 17:50:13 +01:00
DizzyEggg
308e1594c9
Merge pull request #212 from Fontbane/gooey
Queenly Majesty, Big Pecks, Gooey and Tangling Hair
2019-12-23 17:23:33 +01:00
DizzyEggg
e4a9a228c5
Merge pull request #210 from ultima-soul/battle_engine
Implement Leaf Guard.
2019-12-23 17:15:51 +01:00
DizzyEggg
9e3d5672e6 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-12-23 16:40:21 +01:00
ultima-soul
1146de4561 Implement Unburden. 2019-12-21 23:09:06 -08:00
Fontbane
2fb6ea4fc4 Big Pecks 2019-12-19 14:01:46 -05:00
ultima-soul
029ab67ff4 Implement Leaf Guard. 2019-12-16 00:29:20 -08:00
GriffinR
ed1ff0ad77 Document misc strings and text colors 2019-12-10 19:29:23 -06:00
DizzyEggg
9b459eb64a Fix atk49state 2019-12-09 08:41:09 +01:00
DizzyEggg
740ab29c7c
Merge pull request #204 from cfmnephrite/beta
Dancer
2019-12-09 08:36:22 +01:00
DizzyEggg
ac499bc896 Merge with master 2019-12-09 08:16:18 +01:00
Nephrite
0343f63eda Dancer
Implemented Dancer and all relevant code for interacting with abilities, certain moves, etc
2019-12-07 10:19:01 +00:00
GriffinR
c40879aa36 Use ST_OAM constants for OamData definitions 2019-12-06 19:05:44 -06:00
Thomas Winwood
e3f7f47321 Turn some magic numbers into named constants 2019-11-23 07:53:26 -06:00
DizzyEggg
b4ac979600 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-11-10 12:09:43 +01:00
DizzyEggg
ea6736cd8d merge 2019-11-10 12:09:14 +01:00
Marcus Huderle
01e6fb6dd0 Document some battle_bg-related things 2019-11-07 18:24:04 -06:00
huderlem
a4b4ecd470
Merge pull request #787 from GriffinRichards/rename-tablecmds
Rename table cmds
2019-11-04 16:31:27 -06:00
DizzyEggg
1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01:00
GriffinR
e01ec84837 Document party_menu second pass 2019-10-31 03:25:56 -04:00
GriffinR
5fd44d1e74 Rename some STAT_CHANGE macros 2019-10-26 11:53:00 -04:00
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
DizzyEggg
621dd4f0bf Fix Sheer Force moves and effects happening 2019-10-21 14:48:03 +02:00
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
GriffinR
5325835ee7 Use STR_CONV constants 2019-09-30 15:43:44 -04:00
GriffinR
73b96fe145 Rename CONTACT macros to ON_DAMAGE 2019-09-27 12:27:36 -04:00
GriffinR
3bf8129396 Clean up new Cmd macro names 2019-09-27 02:54:28 -04:00
GriffinR
1016b23918
Merge branch 'master' into rename-tablecmds 2019-09-26 15:02:38 -04:00
huderlem
886f043025
Merge pull request #816 from jiangzhengwenjz/ptch-3
get rid of goto in battle_script_commands
2019-09-25 16:31:53 -05:00
GriffinR
6ab192e739 Review changes for #807 2019-09-17 16:50:17 -05:00
GriffinR
b46c4b6703 more constant usage 2019-09-16 19:21:23 -05:00
GriffinR
bb236b490d Update BS constants for Cmd rename 2019-09-15 17:58:12 -04:00
DizzyEggg
7647941ec4 Fix Truant in new switch in system 2019-08-30 12:51:56 +02:00
DizzyEggg
f979987c2f Fix Intimidate and Trace on new switch in system 2019-08-30 12:25:21 +02:00
jiangzhengwenjz
4f9052cb96 get rid of goto in battle_script_commands 2019-08-28 06:06:17 +08:00
DizzyEggg
c97869018d Fix Mega Indicator appearing and priority 2019-08-25 15:33:28 +02:00
GriffinR
869d0eebc0
Rename atk## constants and states 2019-08-23 08:46:21 -04:00