723 Commits

Author SHA1 Message Date
GriffinR
8c6e89e994 Bit shifts from hex to decimal 2021-03-30 17:38:09 -04:00
ghoulslash
a595b213b4 merge with be 2021-03-28 17:29:22 -06:00
GriffinR
7a5c6d4d86 Standardize Friendship/Happiness 2021-03-27 17:27:20 -05:00
ultima-soul
5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07:00
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
ghoulslash
3f9bf5acc0 merge with be 2021-03-09 10:33:48 -07:00
Evan
2ccdf1d89e merge with be. magic guard checks 2021-03-03 09:21:06 -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
Evan
6cb8c6309a merge with be 2021-03-01 11:28:51 -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
GriffinR
b71b10623b Add palette selection constants 2021-02-24 11:03:51 -05:00
GriffinR
8634710996 Document PokemonUseItemEffects 2021-02-12 16:02:04 -05:00
Evan
f3d975e239 merge with be 2021-02-12 08:59:55 -07:00
amiosi
e5ff25ccbf partial update to nature/secret power and camouflage 2021-02-11 17:38:18 -05:00
amiosi
eb56488b81 fix build errors 2021-02-06 20:08:25 -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
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
ultima-soul
2a20d50904 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-02-01 15:54:08 -08:00
Evan
1c75483f51 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ripen 2021-01-31 23:31:38 -07:00
Evan
f428e5e2dc some quick claw/custap berry fixes 2021-01-31 23:31:27 -07:00
LOuroboros
d0e0ff34b4 Updated the list of abilities unaffected by Gastro Acid
https://bulbapedia.bulbagarden.net/wiki/Category:Abilities_that_cannot_be_suppressed
2021-01-24 23:09:23 -03:00
GriffinR
4eca05ccf5 Document remainder of battle_controllers.c 2021-01-22 02:48:22 -05:00
Evan
bfb7333507 memento gen4 failing 2021-01-21 12:03:30 -07:00
Evan
4611c71bd1 merge with be 2021-01-21 08:55:14 -07:00
Evan
8ec12c665c merge with be 2021-01-20 17:36:13 -07:00
Evan
e61309dce6 merge with be 2021-01-20 17:34:24 -07:00
Evan
16d54b6d32 merge with be, add form checks to CanBattlerGetOrLoseItem 2021-01-20 14:28:03 -07:00
Evan
57c460f40a fix two turn moves failing on turn 1 w no target 2021-01-19 22:10:03 -07:00
Evan
a49b5d1ad0 prankster updated to gen 7 2021-01-16 16:14:36 -07:00
Evan
c2dfc571b2 misty terrain blocks confusion 2021-01-16 12:21:04 -07:00
Evan
10b1d33d13 handle battler being affected by terrain 2021-01-16 12:05:51 -07:00
Evan
9e29d303ec electric and misty terrain preventions 2021-01-16 11:40:02 -07:00
Evan
544d598506 update tailwind timer 2021-01-15 18:34:47 -07:00
Evan
d26605c9fe fix bad bg fade if no permanent terrain 2021-01-13 16:01:47 -07:00
GriffinR
b9e1b050e1 Label remaining battle types 2021-01-13 15:20:29 -05:00
Evan
56395a060f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2021-01-13 09:23:07 -07:00
Evan
1e22ae4cf2 merge with be 2021-01-10 09:08:25 -07:00
Evan
d4e4405cf5 merge with be 2021-01-10 09:04:21 -07:00
Evan
e748db8ef4 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2021-01-10 08:58:16 -07:00
Evan
b5128be68b eject packer invisible before openpartymenu 2021-01-08 08:02:00 -07:00
Evan
6dabff1ee3 merge with be 2021-01-07 21:24:21 -07:00
Evan
2bd5167a6c eject pack 2021-01-07 21:11:56 -07:00
Evan
0118723a9c add eject button 2021-01-07 20:31:27 -07:00
Evan
5eb49722c0 add red card effect 2021-01-07 19:33:39 -07:00
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
ghoulslash
c392a2011e
Merge pull request #1325 from ExpoSeed/BE/sync
Sync battle engine
2021-01-07 12:13:26 -07:00