ghoulslash
2f69748e0d
merge with be
2021-09-23 14:38:01 -04:00
ghoulslash
33972b5493
merge with be
2021-09-23 12:04:13 -04:00
ghoulslash
3f34fec42f
change last ball graphic based on config. replace saveblock field with ewram field
2021-09-23 12:03:01 -04:00
Eduardo Quezada D'Ottone
d084d2a68d
Merge branch 'BattleEngine' into booleanStandard
...
# Conflicts:
# include/battle.h
# src/battle_main.c
# src/battle_script_commands.c
2021-09-22 23:42:00 -03:00
Eduardo Quezada D'Ottone
075c0299a1
Better names for Micle and Custap flags
2021-09-22 23:29:26 -03:00
Eduardo Quezada D'Ottone
380e1e470c
Applied use of TRUE and FALSE for flags.
2021-09-22 23:29:00 -03:00
ghoulslash
936f2c7bcb
fix eject pack weak armor special case
2021-09-22 21:51:37 -04:00
ghoulslash
d738297f24
merge with be
2021-09-22 16:26:09 -04:00
ghoulslash
1309eea8ec
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_move_effects
2021-09-22 09:43:48 -04:00
ghoulslash
13062b5a8f
fix lash out, obstruct, and decorate
2021-09-22 09:43:40 -04:00
ghoulslash
fc84ebbd3e
redo prankster checks to handle assist
2021-09-22 08:06:42 -04:00
Eduardo Quezada D'Ottone
287ffff2e2
Merge branch 'battle_engine' into burmy-form-change
2021-09-21 22:34:37 -03:00
Eduardo Quezada D'Ottone
f338813c6a
Merge pull request #1538 from DizzyEggg/double_onemon_battles
...
Support for double battles with only one pokemon
2021-09-20 23:40:08 -03:00
ghoulslash
0ea6c65b83
merge with be
2021-09-17 09:10:09 -04:00
ghoulslash
af8d86f0c9
merge with be
2021-09-16 13:33:35 -04:00
ghoulslash
9d8672e3df
merge with be
2021-09-16 13:12:59 -04:00
ghoulslash
95af97593b
fix some comment styling. fix throat spray for multi-target moves
2021-09-14 11:53:35 -04:00
LOuroboros
3113e4fa12
Moved stat recalculation to HandleEndTurn_FinishBattle
2021-09-06 07:40:35 -03:00
ExpoSeed
5a5c257f68
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-09-02 21:43:20 -05:00
ghoulslash
7c53214dad
merge with be
2021-09-02 15:33:42 -04:00
ultima-soul
a10a02a536
Merge pull request #1221 from ghoulslash/battle_engine
...
Implement Pickpocket
2021-09-02 11:33:34 -07:00
ghoulslash
dfe59992d3
merge with be
2021-09-01 07:37:45 -04:00
ghoulslash
e4fb9c4593
fix throwing ball in wild doubles
2021-08-31 12:51:03 -04:00
ultima-soul
5cb73a012c
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp
2021-08-30 11:57:27 -07:00
ExpoSeed
0f99d9d4c6
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-08-30 13:26:40 -05:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
ultima-soul
988320b89a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-08-17 11:25:13 -07:00
GriffinR
dfdcfc1568
Document remaining functions in cable_club
2021-08-15 16:22:15 -04:00
ghoulslash
d218322b2c
merge with be
2021-08-12 01:26:13 -04:00
ultima-soul
64a48800c9
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-08-11 17:10:57 -07:00
ultima-soul
3f75a58137
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-08-11 16:55:29 -07:00
ultima-soul
02c9e040df
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-11 16:33:10 -07:00
BuffelSaft
f0cb6190e0
Implement Burmy form change
...
Burmy changes form based on where it last battled.
2021-08-07 20:56:10 +12:00
ghoulslash
0a0687ae78
add smart wild AI
2021-07-27 09:49:39 -06:00
ghoulslash
c914ed8572
fix sucker punch, surging strikes, obstruct, and snipe shot
2021-07-25 09:38:54 -06:00
ghoulslash
a37d4c3da9
merge with be, give life dew jungle healing effect
2021-07-25 08:22:05 -06:00
ghoulslash
45d4cee243
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball
2021-07-18 11:11:03 -06:00
BuffelSaft
90fdb74ccb
Remove UndoFormChangeOnSwitch
...
Handle switching out Mimikyu Busted in UndoFormChange.
2021-07-16 17:56:53 +12:00
PikalaxALT
810ca5f8ff
Flatten pos fields in struct Sprite
2021-07-07 09:11:52 -04:00
ghoulslash
d28ac33b0e
fix throw last used ball action turn order checks
2021-07-04 09:28:59 -06:00
ultima-soul
53e900a643
Rearranged rest of item ids except for Key Items.
2021-07-02 22:43:50 -07:00
ghoulslash
c06029bc72
add last used ball
2021-06-25 13:37:59 -06:00
GriffinR
6d92b466e7
Add missing use of F_TRAINER_FEMALE
2021-06-25 11:50:09 -04:00
Xhyzi
c2bd046ea6
Shell Trap
2021-06-15 20:22:50 +02:00
Xhyzi
271f19e6cb
Terrain Pulse
2021-06-15 20:01:57 +02:00
Xhyzi
0202b75822
Beak Blast
2021-06-15 19:57:21 +02:00
ultima-soul
b7706f1b99
Remove ball catch rate modifier effects.
2021-06-10 21:59:13 -07:00
ExpoSeed
c8fc141287
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-06-10 11:54:20 -05:00
DizzyEggg
4b29ae39ad
Allow one mon double battles
2021-06-08 16:40:47 +02:00
ultima-soul
0a87adad1a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-06-07 18:05:52 -07:00
