MissingNoL
|
f30a9542ee
|
Problem: Photon Geyser is calculating as Shell Side Arm?? Needs: Poison effect, contact move for Shell Side Arm
|
2021-05-27 22:21:55 -07:00 |
|
ultima-soul
|
14a0303e2f
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-04-27 18:36:37 -07:00 |
|
GriffinR
|
9ea9ffde09
|
Add remaining multistring chooser constants
|
2021-04-03 11:49:06 -04:00 |
|
ultima-soul
|
5bab9474dc
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-03-22 23:08:19 -07:00 |
|
PikalaxALT
|
925e68c03f
|
Update newly named fields
|
2021-03-15 15:22:41 -04:00 |
|
PikalaxALT
|
8d4dcb228a
|
More documentation in battle_main
|
2021-03-12 16:55:58 -05:00 |
|
PikalaxALT
|
e32a1571af
|
Resolve link comm buffers in gBattleStruct
|
2021-03-12 15:37:31 -05:00 |
|
Evan
|
2ccdf1d89e
|
merge with be. magic guard checks
|
2021-03-03 09:21:06 -07:00 |
|
ultima-soul
|
e5fa583a08
|
Merge pull request #1334 from ghoulslash/gen8_abilities
More Gen 8 Abilities
|
2021-03-01 10:40:09 -08:00 |
|
Evan
|
f4d4cf262e
|
fix screen cleaner, curious medicine, as one
|
2021-02-02 09:00:07 -07:00 |
|
Evan
|
f428e5e2dc
|
some quick claw/custap berry fixes
|
2021-01-31 23:31:27 -07:00 |
|
GriffinR
|
a392cca928
|
Misc battle documentation
|
2021-01-23 00:40:31 -05:00 |
|
GriffinR
|
c106f7f130
|
Document battle_controller_opponent.c
|
2021-01-22 21:35:16 -05:00 |
|
GriffinR
|
63a7828772
|
Document battle_controller_player.c
|
2021-01-22 20:03:27 -05:00 |
|
GriffinR
|
4eca05ccf5
|
Document remainder of battle_controllers.c
|
2021-01-22 02:48:22 -05:00 |
|
Evan
|
4611c71bd1
|
merge with be
|
2021-01-21 08:55:14 -07:00 |
|
Evan
|
9902f6e603
|
merge with be
|
2021-01-13 14:32:14 -07:00 |
|
Evan
|
1e22ae4cf2
|
merge with be
|
2021-01-10 09:08:25 -07: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
|
efa4fe89ad
|
micle berry
|
2021-01-06 10:47:07 -07:00 |
|
Evan
|
f2e486eb0d
|
custap berry effect, custap/quick claw activation message
|
2021-01-06 09:37:31 -07:00 |
|
LOuroboros
|
517c8ffdd0
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities_BE
|
2021-01-03 22:05:14 -03:00 |
|
ExpoSeed
|
7dadcb94b8
|
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
|
2021-01-03 17:14:43 -06:00 |
|
Evan
|
b85dacce9d
|
fix conflicts
|
2020-12-14 08:50:41 -07: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
|
426ea191ad
|
style fix
|
2020-12-05 21:04:12 -07:00 |
|
Evan
|
d5ad14c349
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into popup
|
2020-12-05 21:03:20 -07:00 |
|
Evan
|
21cab1b7a7
|
better negative totem boost system, totems occur before switch in abilities
|
2020-12-05 21:00:51 -07: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
|
ef43596a79
|
toggleable manual ability popup destruction
|
2020-11-19 15:16:27 -07: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 |
|
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 |
|
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 |
|
MCboy
|
e31158d017
|
add spaces around - and remove comment from include in battle.h
|
2020-11-06 23:29:52 +03:30 |
|
MCboy
|
3b91735e63
|
use constants for ball throw count
|
2020-11-06 22:59:46 +03:30 |
|
aaaaaa123456789
|
1c3d75f673
|
Merge branch 'master' into reverts
|
2020-10-26 12:16:36 -03:00 |
|
Kurausukun
|
90211248af
|
re-match Cmd_unknown_24 (from #1140)
changes to data structs are necessary. other things that look
unnecessary, like the order of operands, are also necessary. fuck this
function.
|
2020-10-23 20:47:10 -04:00 |
|
Eduardo Quezada
|
0d39b29691
|
Option to use Gen 3 Physical/Special split.
|
2020-10-15 00:16:50 -03:00 |
|
ExpoSeed
|
9e2c8a95c1
|
Sync bev2 with pret
|
2020-10-11 01:01:47 -05:00 |
|
GriffinR
|
65a4e06737
|
Add ITEM6_HEAL constants, change move flags to shifts
|
2020-10-05 18:48:51 -04: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 |
|
DizzyEggg
|
97d0643110
|
Merge with master
|
2020-09-08 12:48:28 +02:00 |
|
GriffinR
|
afb3472282
|
Minor battle_anim_throw cleanup
|
2020-08-30 15:11:44 -04:00 |
|
hondew
|
e46b35455d
|
Merge branch 'master' into pokeball-doc
|
2020-08-30 14:14:38 -04:00 |
|