Evan
2ccdf1d89e
merge with be. magic guard checks
2021-03-03 09:21:06 -07:00
ghoulslash
bcb6fe154b
Update src/battle_main.c
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:00 -07:00
Evan
55b8538f68
merge with be
2021-03-01 11:22:37 -07:00
ultima-soul
ef054c5d48
Merge pull request #1342 from ghoulslash/fixes
...
Magic Room Affects Macho Brace/Power Item Speed Drop
2021-03-01 08:50:59 -08:00
ultima-soul
2a20d50904
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-02-01 15:54:08 -08:00
Evan
f428e5e2dc
some quick claw/custap berry fixes
2021-01-31 23:31:27 -07:00
Evan
4611c71bd1
merge with be
2021-01-21 08:55:14 -07:00
GriffinR
bc20fda604
Use GET_UNOWN_LETTER macro
2021-01-19 04:03:16 -05:00
Evan
9902f6e603
merge with be
2021-01-13 14:32:14 -07:00
GriffinR
b9e1b050e1
Label remaining battle types
2021-01-13 15:20:29 -05:00
Evan
8bad377a2e
magic room affects macho brace/power item speed drop
2021-01-10 16:57:27 -07:00
Evan
1e22ae4cf2
merge with be
2021-01-10 09:08:25 -07:00
SphericalIce
3c2a33b9b2
Use constants for max IVs & the random IV generation flag
2021-01-07 22:13:14 +00:00
ultima-soul
d2d961e447
Merge pull request #1262 from LOuroboros/gen8_abilities_BE
...
Implemented various Gen. 8 abilities
2021-01-07 13:31:17 -08:00
Evan
f2e486eb0d
custap berry effect, custap/quick claw activation message
2021-01-06 09:37:31 -07:00
ExpoSeed
7dadcb94b8
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-03 17:14:43 -06:00
GriffinR
769ddf22c2
Label remaining subs in battle_tower.c
2020-12-24 16:18:47 -05:00
Evan
67fefd0261
var terrain, surge fixes
2020-12-13 19:42:48 -07:00
Kurausukun
58976ebaa8
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
Evan
21cab1b7a7
better negative totem boost system, totems occur before switch in abilities
2020-12-05 21:00:51 -07:00
LOuroboros
6bbd88049a
Ball Fetch tweaks
2020-12-05 03:03:55 -03:00
LOuroboros
9e1d7cc827
Implemented Ball Fetch
2020-12-02 23:09:35 -03:00
Evan
4ad5e368a9
fix merge conflicts
2020-12-01 17:57:57 -05:00
Evan
99d9a36860
add totem boosts
2020-11-19 10:35:37 -07:00
ultima-soul
e15a86caae
Add ifdef for Hidden Abilities from Pokémon Expansion and change gBattlerAbility back to a u8.
2020-11-17 10:32:24 -08:00
ultima-soul
e32659d4bb
Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities.
2020-11-16 13:50:26 -08:00
ultima-soul
c3423b4212
Merge pull request #1206 from ExpoSeed/type-changing-moves
...
Refactor move effects for type changing moves
2020-11-12 19:10:48 -08:00
Eduardo Quezada D'Ottone
e6f8d57f08
Merge remote-tracking branch 'RHH/battle_engine' into BE-WishMegaEvo
...
# Conflicts:
# include/constants/battle_string_ids.h
2020-11-10 17:28:17 -03:00
ExpoSeed
d2566c8988
Refactor Multi-Attack, Judgment, and Techno Blast to use the same move effect
2020-11-07 23:34:04 -06:00
ultima-soul
99fdc13e61
Merge branch 'master' into battle_engine_sync
2020-11-07 15:59:20 -08:00
Eduardo Quezada D'Ottone
09a5d6c722
Implemented Wish Mega Evolution
2020-11-07 10:13:32 -03:00
aaaaaa123456789
bacc831aa9
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
aaaaaa123456789
1c3d75f673
Merge branch 'master' into reverts
2020-10-26 12:16:36 -03:00
Kurausukun
fe40c0c466
re-match BattleIntroOpponent1SendsOutMonAnimation
...
a lot of functions and a bit of data had to be moved from battle_main.c
to battle_util.c; I have added a note to battle_util.c stating the
reason for this
2020-10-26 05:52:00 -04:00
Eduardo Quezada
d596fa7e12
Merge remote-tracking branch 'RHH/battle_engine' into PR-MoveSplitOption
...
# Conflicts:
# include/battle_util.h
# include/constants/battle_config.h
# src/battle_util.c
2020-10-23 21:49:59 -03:00
Kurausukun
64ba8c8061
port fakematch fixes from #1155
2020-10-22 05:45:53 -04:00
LOuroboros
00bc6ab96b
More review corrections
2020-10-21 16:39:06 -03:00
LOuroboros
503134167a
Review corrections
2020-10-21 15:01:53 -03:00
LOuroboros
4794c63066
Reincorporated badge based stat boosts
2020-10-21 12:57:57 -03:00
Eduardo Quezada
a6e88b82ee
Review changes and option to hide split icon.
2020-10-15 20:15:44 -03:00
LOuroboros
e4635525e7
Renamed the HOLD_EFFECT_EV_BOOST label
2020-10-15 04:52:03 -03:00
Eduardo Quezada
0d39b29691
Option to use Gen 3 Physical/Special split.
2020-10-15 00:16:50 -03:00
ExpoSeed
d4e58d9746
Fix style, sync moved functions properly
2020-10-13 09:40:01 -05:00
ExpoSeed
9e2c8a95c1
Sync bev2 with pret
2020-10-11 01:01:47 -05:00
GriffinR
5259898325
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
Kaz
847878eae9
battle_gfx_sfx_util.c: Very annoying fakematch fix.
...
daycare.c: -g eliminates the need for the brace hack.
battle_transition.c: Fix Phase2_Ripple_Func2...?
2020-09-19 17:12:25 -04:00
aaaaaa123456789
7dc95a0103
Undo PokeCodec's PRs
...
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.
Reverts #1104 , #1108 , #1115 , #1118 , #1119 , #1124 , #1126 , #1127 , #1132 , #1136 ,
#1137 , #1139 , #1140 , #1144 , #1148 , #1149 , #1150 , #1153 , #1155 , #1177 , #1179 ,
#1180 , #1181 , #1182 and #1183 .
2020-09-13 06:30:55 -03:00
PokeCodec
bb5da949f2
Fix build
2020-09-08 19:44:33 -04:00
PokeCodec
e84da39d8a
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 18:54:51 -04:00
PokeCodec
3336eb341d
More adjustments
2020-09-08 14:26:37 -04:00
