ghoulslash
|
416c517e49
|
Merge pull request #1786 from Xavion3/damage_debug
Adds simulated damage to the debug menu
|
2021-10-19 12:14:38 -04:00 |
|
LOuroboros
|
a6315ffc75
|
Implemented Plasma Fists
|
2021-10-19 09:50:18 -03:00 |
|
ghoulslash
|
eda99fcf29
|
Merge pull request #1742 from AsparagusEduardo/be_gStatuses4
Add gStatutes4
|
2021-10-19 08:45:47 -04:00 |
|
Xavion3
|
150dd7c633
|
Add damage information to the debug menus
|
2021-10-19 22:39:07 +11:00 |
|
LOuroboros
|
d9b8e11a9c
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE
|
2021-10-19 07:47:42 -03:00 |
|
ghoulslash
|
8dc77e6fe3
|
Merge pull request #1782 from LOuroboros/glare
Updated Glare
|
2021-10-17 22:11:33 -04:00 |
|
Eduardo Quezada D'Ottone
|
ead5c92469
|
Merge branch 'battle_engine' into PLG
|
2021-10-17 17:38:54 -03:00 |
|
LOuroboros
|
e7ad7319e3
|
Updated Glare
|
2021-10-17 12:03:35 -03:00 |
|
Eduardo Quezada D'Ottone
|
df817fb2ab
|
Merge pull request #1772 from LOuroboros/gravApple
Added Grav Apple's power boost
|
2021-10-17 09:51:29 -03:00 |
|
LOuroboros
|
59cfbe55c1
|
Gave Grav Apple a move effect of its own
|
2021-10-17 09:27:35 -03:00 |
|
ghoulslash
|
964e7efba9
|
fix MOVE_TARGET_ALL_BATTLERS and other u8 vars
|
2021-10-16 16:23:17 -04:00 |
|
ghoulslash
|
5509ceea04
|
expand move target field
|
2021-10-16 16:10:45 -04:00 |
|
BuffelSaft
|
df2223a5bc
|
Merge pull request #1745 from LOuroboros/retaliate
Implemented Retaliate's effect
|
2021-10-16 22:49:32 +13:00 |
|
LOuroboros
|
3b6ceb1dfa
|
Turned Retaliate into a side timer
|
2021-10-16 06:04:04 -03:00 |
|
ghoulslash
|
1f176242aa
|
add missing func definition
|
2021-10-15 16:06:50 -04:00 |
|
ghoulslash
|
c077091dbf
|
small fixes, check GetCatchingBattler's semi-invulnerability
|
2021-10-15 14:57:26 -04:00 |
|
ghoulslash
|
b94f710c80
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ballthrow
|
2021-10-15 14:49:37 -04:00 |
|
Eduardo Quezada D'Ottone
|
0a090616ef
|
Merge pull request #1765 from ghoulslash/shell_smash
Shell Smash Animation
|
2021-10-15 12:09:06 -03:00 |
|
ghoulslash
|
ef19c8c415
|
fix gen define
|
2021-10-15 09:22:50 -04:00 |
|
ghoulslash
|
883a249836
|
config for catching semi-invulnerable mons
|
2021-10-15 09:20:32 -04:00 |
|
LOuroboros
|
3a25bce185
|
Turned Retaliate's effect into a side status
|
2021-10-15 06:03:48 -03:00 |
|
LOuroboros
|
1f97198267
|
Oops, I forgot to take the opponent's side into account
|
2021-10-15 05:02:14 -03:00 |
|
Eduardo Quezada D'Ottone
|
21837b659a
|
Merge branch 'battle_engine' into bug_bite
|
2021-10-14 19:46:50 -03:00 |
|
ghoulslash
|
85ce72a4d0
|
add shell smash anim
|
2021-10-14 10:47:39 -04:00 |
|
BuffelSaft
|
fc6e8f598c
|
Merge branch 'battle_engine' into battle_bond
|
2021-10-14 16:24:59 +13:00 |
|
BuffelSaft
|
bb8d0e3d6b
|
Fix Battle Bond
Battle Bond Greninja transforms only after a KO, and doesn't revert when switched out.
|
2021-10-14 16:18:11 +13:00 |
|
Eduardo Quezada D'Ottone
|
d689842689
|
Merge pull request #1657 from ghoulslash/rototiller
Rototiller Fix + MOVE_TARGET_ALL_BATTLERS
|
2021-10-13 22:45:50 -03:00 |
|
ghoulslash
|
a3d2bdc9cf
|
merge with be
|
2021-10-13 18:30:53 -04:00 |
|
ghoulslash
|
3248bd796a
|
add quick draw
|
2021-10-12 21:49:18 -04:00 |
|
ghoulslash
|
996301d5d3
|
add mirror armor
|
2021-10-12 18:04:34 -04:00 |
|
ghoulslash
|
bbd09fdcf7
|
add wandering spirit
|
2021-10-12 10:32:51 -04:00 |
|
LOuroboros
|
6c550cd749
|
Implemented Retaliate's effect
|
2021-10-11 03:19:21 -03:00 |
|
ghoulslash
|
06bcfea3b8
|
merge with be
|
2021-10-10 19:56:33 -04:00 |
|
ghoulslash
|
fcada4fcad
|
handle rototiller + prankster
|
2021-10-10 19:54:17 -04:00 |
|
Eduardo Quezada D'Ottone
|
c3f8b77d82
|
Setting for pre-Gen6 Hidden Power Damage.
|
2021-10-10 20:26:38 -03:00 |
|
Eduardo Quezada D'Ottone
|
7798468ce9
|
Merge pull request #1738 from BuffelSaft/safety-googles
Fix Safety Googles
|
2021-10-10 18:34:20 -03:00 |
|
Eduardo Quezada D'Ottone
|
cf6e3873b4
|
Moved Electrified to Status4.
|
2021-10-10 01:13:23 -03:00 |
|
Eduardo Quezada D'Ottone
|
903c4cbf68
|
Config for Blizzard + Hail
|
2021-10-09 23:52:37 -03:00 |
|
Eduardo Quezada D'Ottone
|
004f705607
|
Merge pull request #1549 from ghoulslash/last_ball
add last used ball
|
2021-10-09 17:27:28 -03:00 |
|
LOuroboros
|
91a68cd5db
|
Implemented Primal Reversion
|
2021-10-09 00:36:41 -03:00 |
|
BuffelSaft
|
274e964d91
|
Fix Safety Googles
Fix typo and update gLastUsedItem before calling the safety goggles battle script.
|
2021-10-09 15:05:01 +13:00 |
|
BuffelSaft
|
fbc4d7584e
|
Merge pull request #1610 from LOuroboros/primalAbilities
Implement Desolate Land, Primordial Sea and Delta Stream
|
2021-10-08 20:01:09 +13:00 |
|
ghoulslash
|
4aeadd96c9
|
merge with be
|
2021-10-06 14:49:23 -04:00 |
|
ghoulslash
|
391cfabcac
|
merge with be
|
2021-10-06 14:31:21 -04:00 |
|
ghoulslash
|
ee3a2c97ee
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball
|
2021-10-06 13:54:40 -04:00 |
|
ghoulslash
|
1ad8448532
|
remove saveblock field
|
2021-10-06 13:54:33 -04:00 |
|
ghoulslash
|
4382420dd2
|
merge with be
|
2021-10-06 13:32:59 -04:00 |
|
ghoulslash
|
1f4844c7f5
|
Merge pull request #1710 from AsparagusEduardo/BE_Struggle
Implemented modern effect of struggle with config
|
2021-10-06 09:27:10 -04:00 |
|
ghoulslash
|
245ef1ad2d
|
Merge pull request #1715 from AsparagusEduardo/BE_ShadowTag
Config for Shadow Tag vs Shadow Tag
|
2021-10-06 09:02:58 -04:00 |
|
LOuroboros
|
2b32581c14
|
Fixed infinite loop
|
2021-10-06 09:27:33 -03:00 |
|
LOuroboros
|
b85b3094c8
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalAbilitiesDev
|
2021-10-03 07:05:56 -03:00 |
|
Eduardo Quezada D'Ottone
|
978f73475b
|
Config for Shadow Tag vs Shadow Tag
|
2021-10-02 19:01:11 -03:00 |
|
Eduardo Quezada D'Ottone
|
57ea20bc6d
|
Implemented modern effect of struggle with config
|
2021-10-02 13:32:36 -03:00 |
|
LOuroboros
|
c464b1b5dd
|
STRINGID_ATTACKERBECAMEASHGRENINJA -> STRINGID_ATTACKERBECAMEASHSPECIES
|
2021-10-01 23:12:59 -03:00 |
|
LOuroboros
|
f3ded43a88
|
Implemented Battle Bond
|
2021-10-01 22:49:17 -03:00 |
|
ghoulslash
|
761006a164
|
merge with be
|
2021-09-26 19:19:32 -04:00 |
|
LOuroboros
|
1b039062da
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile
|
2021-09-25 22:20:34 -03:00 |
|
Syreldar
|
4c05520bf3
|
Fixed Retaliate's naming.
|
2021-09-24 16:02:26 +02:00 |
|
Eduardo Quezada D'Ottone
|
e87c170db0
|
Merge branch 'BattleEngine' into booleanStandard
# Conflicts:
# src/battle_main.c
# src/battle_script_commands.c
|
2021-09-23 18:20:35 -03:00 |
|
ghoulslash
|
2f69748e0d
|
merge with be
|
2021-09-23 14:38:01 -04:00 |
|
ghoulslash
|
94ec25319f
|
syntax fixes. Use BlocksPrankster for perish song battle script
|
2021-09-23 14:35:37 -04:00 |
|
ghoulslash
|
768598b154
|
fix bad merge
|
2021-09-23 12:22:36 -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
|
2c66aa84b6
|
Merge pull request #1378 from ghoulslash/gen8_move_effects
Several Gen 8 Move Effects
|
2021-09-22 22:48:29 -03:00 |
|
ghoulslash
|
9bf2ffe459
|
fix lash out stat fell
|
2021-09-22 21:15:02 -04:00 |
|
ghoulslash
|
d738297f24
|
merge with be
|
2021-09-22 16:26:09 -04:00 |
|
ghoulslash
|
3559a1b8e6
|
fix prankster + magic coat
|
2021-09-22 16:09:23 -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 |
|
sbird
|
0ee13418dc
|
[ai] use expected value move dmg calculation
|
2021-09-22 13:15:43 +02: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
|
faa963fd04
|
merge with be
|
2021-09-17 09:07:38 -04:00 |
|
ghoulslash
|
b916d7991c
|
merge with be
|
2021-09-16 21:52:29 -04:00 |
|
ghoulslash
|
e756b0accc
|
merge with be
|
2021-09-16 21:41:29 -04:00 |
|
ghoulslash
|
af8d86f0c9
|
merge with be
|
2021-09-16 13:33:35 -04:00 |
|
ghoulslash
|
c2e0990aab
|
fix some merge conflicts
|
2021-09-16 13:29:36 -04:00 |
|
ghoulslash
|
9d8672e3df
|
merge with be
|
2021-09-16 13:12:59 -04:00 |
|
ghoulslash
|
ac42b19de7
|
some formatting fixes
|
2021-09-16 11:54:27 -04:00 |
|
ghoulslash
|
aac7ae3595
|
add MOVE_TARGET_ALL_BATTLERS
|
2021-09-16 10:45:33 -04:00 |
|
ghoulslash
|
9c94eb6140
|
but it failed check for rototiller
|
2021-09-16 10:24:32 -04:00 |
|
ghoulslash
|
85f3982fb9
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into prankster
|
2021-09-15 17:52:45 -04:00 |
|
ghoulslash
|
f61d516aad
|
some syntax/format fixes
|
2021-09-15 17:15:50 -04:00 |
|
ghoulslash
|
845e333ba1
|
fix electric/misty terrain interactions with yawn/rest failures
|
2021-09-15 17:11:42 -04:00 |
|
ghoulslash
|
aa475ab300
|
merge with be
|
2021-09-15 16:42:23 -04:00 |
|
ghoulslash
|
0bca01cb74
|
mental herb fixes
|
2021-09-15 12:56:58 -04:00 |
|
ghoulslash
|
b85586a33a
|
merge with be
|
2021-09-15 12:54:39 -04:00 |
|
ghoulslash
|
c4ce4c150d
|
fix eject pack
|
2021-09-14 15:38:16 -04:00 |
|
ghoulslash
|
55c3e152cf
|
replace some BufferStatChange, fix room service and terrain seeds
|
2021-09-14 15:07:15 -04:00 |
|
ghoulslash
|
60713a8f2d
|
fix room service activation msg, stat target
|
2021-09-14 12:50:36 -04:00 |
|
ghoulslash
|
95af97593b
|
fix some comment styling. fix throat spray for multi-target moves
|
2021-09-14 11:53:35 -04:00 |
|
ghoulslash
|
f3f26d1a6f
|
merge with be
|
2021-09-13 19:40:28 -04:00 |
|
ghoulslash
|
6915b029bd
|
fix echoed voice power boost
|
2021-09-09 11:15:58 -04:00 |
|
ghoulslash
|
d7938bc2dc
|
Merge branch 'prankster' of github.com:ghoulslash/pokeemerald into prankster
|
2021-09-09 09:44:25 -04:00 |
|
ghoulslash
|
b8a71cabd1
|
merge with be
|
2021-09-09 09:44:18 -04:00 |
|