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
|
0cdab790dc
|
add blunder policy
|
2021-01-06 15:40:20 -07: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
|
5bdf266000
|
add additional item theft check
|
2020-12-20 19:06:50 -07:00 |
|
Evan
|
a0b9ece980
|
merge with BE
|
2020-12-20 16:39:50 -07:00 |
|
Evan
|
21e7d6d318
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
|
2020-12-20 16:33:43 -07:00 |
|
Evan
|
7988a1f41d
|
Ai_TryOnAlly and reorganize files
|
2020-12-20 14:47:20 -07:00 |
|
Evan
|
31ec3e8479
|
non-partner good move checks
|
2020-12-19 21:58:23 -07:00 |
|
Evan
|
8a544665e4
|
move common ai params to preloaded struct
|
2020-12-16 22:56:10 -07: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 |
|
Evan
|
28698a982d
|
try to faint script -> c
|
2020-12-11 08:05:00 -07:00 |
|
Kurausukun
|
58976ebaa8
|
Merge remote-tracking branch 'upstream/master' into berry_crush
|
2020-12-10 23:30:52 -05:00 |
|
Evan
|
34dd11448b
|
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
|
2020-12-09 10:28:18 -07: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 |
|
Evan
|
39cbc21925
|
fix trainer theft, update config option
|
2020-12-03 08:42:12 -05: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 |
|
Evan
|
435f928aa4
|
opponent trainer theft config option. Clean up code a bit
|
2020-11-13 11:00:44 -07:00 |
|
Evan
|
64bcac4589
|
move pickpocket to back of moveend sequence
|
2020-11-12 23:30:00 -07: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 |
|
hondew
|
328aecc96e
|
Document throwing pokeball
continue
Document more
Doc more funcs
Remove workspace
Document shiny stars
Document PokeBlock
Clean up
Clean more
|
2020-08-30 14:08:06 -04:00 |
|
DizzyEggg
|
f70a9ce153
|
Merge with master
|
2020-08-27 12:01:28 +02:00 |
|
PokeCodec
|
e27975afaa
|
Match battle script commands by correcting a function and the pokemon struct
|
2020-08-18 22:05:01 -04:00 |
|
DizzyEggg
|
0066640a1e
|
Merge with master
|
2020-07-27 14:51:39 +02:00 |
|
GriffinR
|
aba42513d3
|
Clean up some battle scr cmd data
|
2020-07-18 18:10:15 -04:00 |
|
DizzyEggg
|
42f48d1a61
|
Power Construct
|
2020-07-16 15:40:56 +02:00 |
|