Commit graph

1282 commits

Author SHA1 Message Date
BuffelSaft
6132f9a9fe
Merge pull request #1750 from ghoulslash/mirror_armor
Mirror Armor
2021-11-04 11:43:59 +13:00
ghoulslash
48c29a9cd8 proper mirror armor sticky web targeting 2021-11-03 15:05:52 -04:00
ghoulslash
4c9f48e9d8
Merge pull request #1842 from AsparagusEduardo/be_Gen8ContestData
Added Gen 8 contest data
2021-11-02 12:50:45 -04:00
ghoulslash
ffcba355b0 merge w be 2021-11-02 10:36:08 -04:00
BuffelSaft
1e3b3d482b
Merge pull request #1838 from Blackforest92/battle_engine
Edit Spacial Rend and Hurricane background
2021-11-02 17:11:47 +13:00
Eduardo Quezada D'Ottone
8332bfae46 Gen 8 combo moves 2021-11-01 21:59:34 -03:00
ghoulslash
b5d20da927 merge with be 2021-11-01 11:36:18 -04:00
Blackforest92
9b6cd383a4 Optimized Rock Wrecker and Hurricane 2021-11-01 01:06:39 +07:00
ghoulslash
52d4d1cd34 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella 2021-10-31 11:40:00 -04:00
ghoulslash
bc170f3a43 merge with be 2021-10-31 11:04:39 -04:00
ghoulslash
e1f0e6285b
Merge pull request #1828 from BuffelSaft/gorilla-tactics
Implement Gorilla Tactics
2021-10-30 21:44:33 -04:00
ghoulslash
468ee66cd8 fix synthesis and leaf guard w utility umbrella 2021-10-30 11:04:50 -04:00
ghoulslash
ee7b63e372 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella 2021-10-30 09:26:33 -04:00
ghoulslash
f4537b1213 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into wandering_spirit 2021-10-30 09:14:32 -04:00
Blackforest92
799852ea77 Introduce alternate Steel Beam 2021-10-30 17:00:55 +07:00
BuffelSaft
47bfeaeecd Implement Gorilla Tactics
It's Choice Band but as an ability.
2021-10-30 18:31:44 +13:00
ghoulslash
af914ee7ed merge w be 2021-10-29 22:33:50 -04:00
ghoulslash
2502820e83 document a couple hitmarkers. fix failing moves not updating hp from own healing effects 2021-10-29 09:03:14 -04:00
ghoulslash
f342e7c590 merge with be 2021-10-28 17:03:10 -04:00
ghoulslash
e2e31f0b74 skill swap config option for switchin abilities 2021-10-28 16:53:00 -04:00
ghoulslash
34e966fdee
Merge pull request #1815 from LOuroboros/hyperspaceFury
Implemented Hyperspace Fury
2021-10-28 13:20:33 -04:00
LOuroboros
82101d3581 Optimizations 2021-10-28 14:02:43 -03:00
LOuroboros
28522f3ffb Fixed Hyperspace Fury not breaking through protections
Also repositioned VARIOUS_JUMP_IF_SPECIES.
2021-10-28 12:09:44 -03:00
ghoulslash
bebaded415 merge with be 2021-10-27 16:48:38 -04:00
LOuroboros
1ab8c84f41 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury 2021-10-26 21:23:21 -03:00
Eduardo Quezada D'Ottone
773c773bac Merge remote-tracking branch 'RHH/battle_engine' into BE_ghostEscape
# Conflicts:
#	include/constants/battle_config.h
2021-10-26 20:35:01 -03:00
Eduardo Quezada D'Ottone
44625561e5 Taunt turn config 2021-10-24 20:21:54 -03:00
Eduardo Quezada D'Ottone
70aeaf288f Rough Skin damage config 2021-10-24 20:07:22 -03:00
Eduardo Quezada D'Ottone
8699db942b More ordering 2021-10-24 20:03:21 -03:00
Eduardo Quezada D'Ottone
71ff664700 Ordered config into new categories 2021-10-23 20:11:02 -03:00
Eduardo Quezada D'Ottone
d95351dd97 Merge branch 'BattleEngine' into BE_config
# Conflicts:
#	include/constants/battle_config.h
2021-10-23 19:46:33 -03:00
Eduardo Quezada D'Ottone
abb8a97d21
Merge pull request #1616 from LOuroboros/statCalcs
Added configs for modern post-battle stat calcs
2021-10-23 13:35:21 -03:00
Eduardo Quezada D'Ottone
9a8b88bdb3 Updated config description 2021-10-23 11:59:57 -03:00
Eduardo Quezada D'Ottone
76b6250104
Merge branch 'battle_engine' into plasmaFists 2021-10-23 11:06:34 -03:00
Eduardo Quezada D'Ottone
d0253640fb
Merge pull request #1739 from LOuroboros/primalReversionBE
Implemented Primal Reversion
2021-10-22 22:27:45 -03: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
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
ghoulslash
c077091dbf small fixes, check GetCatchingBattler's semi-invulnerability 2021-10-15 14:57:26 -04: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
Eduardo Quezada D'Ottone
21837b659a
Merge branch 'battle_engine' into bug_bite 2021-10-14 19:46:50 -03:00
BuffelSaft
fc6e8f598c Merge branch 'battle_engine' into battle_bond 2021-10-14 16:24:59 +13:00