Commit Graph

9504 Commits

Author SHA1 Message Date
ghoulslash
02a62e245b
Merge pull request #1992 from AsparagusEduardo/BE_WhiteOutMoney
Config for lost money after losing a battle
2022-07-01 11:58:36 -04:00
ghoulslash
b9be123716
Merge pull request #2163 from Sneed69/terrain-softlock-fix
Fix terrain move softlock
2022-07-01 11:58:00 -04:00
ghoulslash
1ddf3ca7e0
Merge pull request #2169 from Sneed69/inverse-flying
Make ungrounded flying mons weak to ground in inverse battles
2022-07-01 11:57:43 -04:00
ghoulslash
6cf0620f93
Merge pull request #2159 from Sneed69/trap-move-arrays
Trap move battle string related code cleanup
2022-07-01 11:07:28 -04:00
sneed
c1af418340 define B_MSG_WRAPPED_ constants 2022-07-01 17:52:46 +03:00
ghoulslash
5ed30b43a4
Merge pull request #2170 from Sneed69/best_type_matchup
AI chooses most resistant mon instead of best offensive type
2022-07-01 10:37:06 -04:00
ghoulslash
a349462b78
Merge pull request #2134 from LOuroboros/bePretMerge
Pret merge for the battle_engine
2022-07-01 09:21:51 -04:00
ghoulslash
42f3cccdbe
Merge pull request #2154 from HamishSinclair/poltergeist
add poltergeist animation
2022-07-01 09:19:49 -04:00
ghoulslash
f4918222e8
Merge pull request #2156 from Sneed69/ai_3rd_type
Type effectivess related AI bugfixes
2022-07-01 09:09:12 -04:00
ghoulslash
80ac427443
Merge pull request #2160 from Sneed69/ignore-mystery-type-3
IS_BATTLER_OF_TYPE ignores third type if it's Mystery
2022-07-01 08:55:08 -04:00
ghoulslash
14c531cf75
Merge pull request #2161 from Sneed69/confusion-fix
Fix confusion and disobedience self damage benefiting from STAB
2022-07-01 08:53:30 -04:00
ghoulslash
ce5c85dd13
Merge pull request #2165 from Sneed69/battle_engine
Heal Block stops Jungle Healing / Life Dew
2022-07-01 08:51:10 -04:00
sneed
5e7df653bd no gest 2022-06-18 19:18:01 +03:00
sneed
f43d54af89 AI chooses most resistant mon 2022-06-18 19:00:33 +03:00
sneed
407047ace7 ground x2 vs flying if inverse battle 2022-06-10 23:23:21 +03:00
sneed
1d19c0dc9f Update battle_util.c 2022-06-05 16:38:37 +03:00
ghoulslash
15fe85902f
Merge pull request #2164 from Sneed69/battle_engine
Heal Block stops Synthesis
2022-06-05 08:18:03 -04:00
sneed
bf1025ac16 Update battle_util.c 2022-06-05 05:09:06 +03:00
sneed
f419fc3ae7 fix terrain move softlock 2022-06-04 18:36:18 +03:00
ghoulslash
24af1d5c1b
Merge pull request #2162 from Sneed69/IsMoveWithoutAnimation
Remove IsMoveWithoutAnimation
2022-06-04 08:38:45 -04:00
Sneed69
c60de5055d remove IsMoveWithoutAnimation 2022-06-03 17:42:42 +03:00
sneed
e1c57e4071 move_none does not benefit from stab 2022-06-01 22:45:50 +03:00
sneed
5934acbdc5 IS_BATTLER_OF_TYPE ignores 3rd type if mystery 2022-06-01 22:21:32 +03:00
sneed
86b436782a trap move related code cleanup 2022-06-01 22:01:50 +03:00
sneed
2e855b204a ai accounts for a third type 2022-05-29 04:55:37 +03:00
hamish
307d5d93c4 add potlergeist animation 2022-05-23 08:53:08 -04:00
Eduardo Quezada D'Ottone
6be8151981
Merge pull request #2146 from Sneed69/castform_battle
Fix castform battle interactions
2022-05-20 10:54:49 -04:00
Eduardo Quezada D'Ottone
df55a185ae
Merge pull request #2147 from Sneed69/r-ball-pike
Disable last used ball in battle pike
2022-05-19 22:04:21 -04:00
sneed
d8d31b7972 disable last used ball in bpike 2022-05-20 04:57:32 +03:00
sneed
881e7e70ec Generalize usage of castformPalette
https://github.com/pret/pokeemerald/pull/1663
2022-05-19 15:23:09 +03:00
sneed
928d3c5a28 change form on weather fade 2022-05-19 15:08:03 +03:00
sneed
0424e37252 Fix cherrim + castform interaction 2022-05-19 14:20:34 +03:00
Eduardo Quezada D'Ottone
671323c3e2
Merge pull request #2139 from ghoulslash/be/wildmon
prevent overwriting wild mon held items
2022-05-13 21:07:46 -04:00
ghoulslash
7dd6988b2b fix args to GetMonData 2022-05-13 20:32:03 -04:00
ghoulslash
b5d98ec93e prevent overwriting wild mon held items 2022-05-13 20:05:52 -04:00
LOuroboros
577791a6bc Moved order of defined header files in include/global.h 2022-05-13 10:52:09 -03:00
LOuroboros
2263caef7a Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine 2022-05-13 03:17:31 -03:00
GriffinR
ed1cc203c6
Merge pull request #1654 from Kurausukun/better_dinfo
Don't Build Modern with -g by Default
2022-05-12 22:41:15 -04:00
Kurausukun
7d224197c0
Update INSTALL.md 2022-05-12 22:33:17 -04:00
Kurausukun
1c13335d16
Update INSTALL.md 2022-05-12 22:05:44 -04:00
GriffinR
1842af7570
Merge pull request #1655 from GriffinRichards/fix-berry-id
Fix math in CreateBerrySprite
2022-05-12 18:04:30 -04:00
Eduardo Quezada D'Ottone
9685afd981
Merge pull request #2127 from Sneed69/evolution-after-whiteout
Allow evolutions after whiting out
2022-05-10 07:49:17 -04:00
sneed
bceccf5474 changes 2022-05-10 08:17:31 +03:00
sneed
709f583390 Initial commit 2022-05-10 02:58:24 +03:00
Eduardo Quezada D'Ottone
f80bab897f
Merge pull request #2112 from AgustinGDLV/evo_battle
Gen 8 Evolution Mechanics (Battle Engine)
2022-05-09 17:40:19 -04:00
AgustinGDLV
9bb5db2275 removed duplicate define 2022-05-08 21:23:51 -07:00
AgustinGDLV
277f4a3751
niceties
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-05-08 21:23:06 -07:00
Eduardo Quezada D'Ottone
78cbbb51bb
Merge pull request #2124 from ghoulslash/be/innerfocus
add inner focus ability popup msg
2022-05-08 20:37:35 -04:00
ghoulslash
07b0ce9737 add inner focus ability popup msg 2022-05-08 17:57:30 -04:00
Eduardo Quezada D'Ottone
13f9919b9e
Merge pull request #2123 from Sneed69/wikiberry_battle
Update Confuse Berry Hold Effect (Battle Engine)
2022-05-08 09:02:33 -04:00