Commit graph

7268 commits

Author SHA1 Message Date
amiosi
b081a00891 Merge branch 'battle_engine' into old_findings 2021-03-13 09:59:09 -05:00
Eduardo Quezada D'Ottone
292993e360
Merge pull request #1338 from ghoulslash/ripen
Add Ripen and Finish Gen4 Berries
2021-03-13 11:16:42 -03:00
Eduardo Quezada D'Ottone
acf9bb0a17
Merge pull request #1365 from ghoulslash/memento
Update Memento Fail Conditions to Gen4+
2021-03-09 17:57:43 -03:00
ghoulslash
3f9bf5acc0 merge with be 2021-03-09 10:33:48 -07:00
Eduardo Quezada D'Ottone
c91413300d
Merge pull request #1392 from ghoulslash/hp_boxes
Fix HP Boxes not Dissapearing with Certian Moves
2021-03-09 08:11:53 -03:00
ghoulslash
68388f633f merge with be 2021-03-08 18:58:16 -07:00
ExpoSeed
685c8283ed
Merge pull request #1411 from BuffelSaft/Batte_Engine_Only
Fix Spiky Shield/Jump Kick freeze
2021-03-08 17:24:36 -06:00
ExpoSeed
9ec04fcce8
Merge pull request #1397 from ghoulslash/escape
Fix Ghost Types Unable to Escape
2021-03-08 17:24:00 -06:00
Evan
41d47a867e format fixes 2021-03-03 10:48:57 -07:00
ghoulslash
f83e8b4f94
Update src/battle_message.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 10:48:17 -07:00
ghoulslash
5207d48b21
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 10:48:11 -07:00
ghoulslash
6739433e9e
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 10:48:05 -07:00
ghoulslash
64e3f7dc24
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 10:47:59 -07:00
Evan
2ccdf1d89e merge with be. magic guard checks 2021-03-03 09:21:06 -07:00
ghoulslash
99c8bd19ca
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:25 -07:00
ghoulslash
3edb7ede29
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:20 -07:00
ghoulslash
43ec4e1041
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:14 -07:00
ghoulslash
0ee9425599
Update include/battle_scripts.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:07 -07:00
ghoulslash
bcb6fe154b
Update src/battle_main.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:00 -07:00
ghoulslash
63b1a02c28
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:13:56 -07:00
ghoulslash
3a30fe900a
Update include/constants/hold_effects.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:13:49 -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
ultima-soul
255a635237
Merge pull request #1295 from ghoulslash/terrain
Various Terrain Effects and Fixes
2021-03-01 10:38:36 -08:00
Evan
6cb8c6309a merge with be 2021-03-01 11:28:51 -07:00
Evan
55649a67cc Merge branch 'terrain' of https://github.com/ghoulslash/pokeemerald into terrain 2021-03-01 11:23:05 -07:00
Evan
55b8538f68 merge with be 2021-03-01 11:22:37 -07:00
ultima-soul
f6147ee054
Merge pull request #1356 from ghoulslash/tailwind_turns
Update tailwind timer To Gen5
2021-03-01 08:51:40 -08:00
ultima-soul
ef054c5d48
Merge pull request #1342 from ghoulslash/fixes
Magic Room Affects Macho Brace/Power Item Speed Drop
2021-03-01 08:50:59 -08:00
amiosi
524982d218 rock blast was unaffected by bulletproof in gen 6
source: bulbapedia
2021-02-19 22:25:57 -05:00
BuffelSaft
2b90c0b945 Fix Spiky Shield/Jump Kick bug
Spiky Shield no longer tries to hurt a Pokemon that has already fainted. Previously this would freeze the game if Jump Kick recoil fainted a Pokemon due to the target using Spiky Shield.
2021-02-19 13:57:29 +13:00
amiosi
e5ff25ccbf partial update to nature/secret power and camouflage 2021-02-11 17:38:18 -05:00
amiosi
62c3a8ce2a spacing 2021-02-11 17:19:45 -05:00
amiosi
1df295a582 battle config and zippy zap
plus fix mirror move mistakes
2021-02-11 17:11:07 -05:00
amiosi
c0ba7436af water shuriken and howl 2021-02-11 16:20:13 -05:00
amiosi
172fe3a257 mirror move + nightmare fix 2021-02-11 09:49:45 -05:00
amiosi
eaf88687b9 do gen 4 king's rock
fix some other mistakes as well
2021-02-10 19:14:05 -05:00
amiosi
648f7343a8 old gen fixes + lock-on & psych up
fix beat up config option as well
2021-02-10 18:41:49 -05:00
amiosi
541f7eb7b6 targetting fixes 2021-02-10 13:57:23 -05:00
amiosi
160b08afb0 fix the rest of the flinching moves 2021-02-08 17:29:35 -05:00
amiosi
038bf42b51 kings rock Gen_X configs 2021-02-08 17:04:33 -05:00
Evan
5e8c8a6aaf fix ghost types unable to escape from mean look/trap 2021-02-07 12:05:55 -07:00
amiosi
eb56488b81 fix build errors 2021-02-06 20:08:25 -05:00
amiosi
8416f65dac king's rock changes 2021-02-06 19:47:06 -05:00
amiosi
30434b92de update even more moves to Gen 8 standard 2021-02-06 19:41:38 -05:00
amiosi
d8e592bf46 update many moves to Gen 8 standard 2021-02-06 19:08:46 -05:00
Evan
6139b12a49 fix hp boxes not dissapearing 2021-02-02 23:30:08 -07:00
ultima-soul
7a237595c9
Merge pull request #1389 from LOuroboros/syntax
Removed trailing spaces from various files
2021-02-02 11:04:34 -08:00
ghoulslash
a00db597ba
Merge pull request #1383 from ultima-soul/battle_engine_sync
Battle Engine Upstream Sync
2021-02-02 10:02:31 -07:00
Evan
00cbe61e13 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities 2021-02-02 09:00:12 -07:00
Evan
f4d4cf262e fix screen cleaner, curious medicine, as one 2021-02-02 09:00:07 -07:00