Commit Graph

9570 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
d73e6faab8 Config for Growth being affected by sunlight 2022-02-13 00:30:37 -03:00
Eduardo Quezada D'Ottone
748ce99de3 Config for Ingrain grounding the user 2022-02-13 00:17:37 -03:00
Eduardo Quezada D'Ottone
76e0b38960 Config for Pokémon with Oblivious being affected by Taunt 2022-02-12 23:57:23 -03:00
Eduardo Quezada D'Ottone
389a38b3cd Config for Facade being affected by burns 2022-02-12 23:55:54 -03:00
Eduardo Quezada D'Ottone
0dd2de988a
Merge branch 'battle_engine' into primalReversionTweaks 2022-02-12 23:08:12 -03:00
Eduardo Quezada D'Ottone
eebe664bfc
Merge pull request #2054 from LOuroboros/conversion
Updated Conversion's effect
2022-02-12 22:08:00 -03:00
LOuroboros
92d8268603
Update include/constants/battle_config.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-02-12 00:18:24 -03:00
LOuroboros
b52233ec31 Updated Conversion's effect 2022-02-11 21:42:39 -03:00
Eduardo Quezada D'Ottone
1454384b1b
Merge pull request #2052 from ghoulslash/be/ai_whostrikesfirst
Fix AI_WhoStrikesFirst
2022-02-11 17:56:53 -03:00
Eduardo Quezada D'Ottone
5c552cd070
Merge pull request #2043 from ghoulslash/be/psychoshift
Psycho Shift uses CanBeStatused Functions
2022-02-11 17:55:11 -03:00
ghoulslash
2782e816a4 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be/psychoshift 2022-02-09 14:31:46 -05:00
ghoulslash
209279c207 fix psycho shift string printing 2022-02-09 14:30:30 -05:00
ghoulslash
fcc85e8c17 fix AI_WhoStrikesFirst 2022-02-09 11:23:30 -05:00
GriffinR
eb07617a20
Merge pull request #1623 from kiliwily/master
Update money.c
2022-02-09 08:34:10 -05:00
kiliwily
a86a279184 Update money.c 2022-02-06 16:25:56 +01:00
Eduardo Quezada D'Ottone
69d62f1cb9
Merge pull request #2049 from ghoulslash/be/quickdraw
Fix ability pop up for quick draw
2022-02-03 21:07:34 -03:00
ghoulslash
36a824d8ab fix ability pop up for quick draw 2022-02-03 17:30:32 -05:00
GriffinR
7d2344c07b
Merge pull request #1616 from GriffinRichards/missing-req
Add missing :req, remove old macros
2022-02-02 22:09:36 -05:00
Eduardo Quezada D'Ottone
5dc6f1caa4
Merge pull request #2047 from SubzeroEclipse/BE_decaps
Decapitalization of some battle strings
2022-02-01 14:57:52 -03:00
SubzeroEclipse
b946775e50 Fixed some new battle strings 2022-02-01 13:19:07 +01:00
GriffinR
f494238a9d
Merge pull request #1621 from GriffinRichards/constants-collision
Add missing collision constant usage
2022-01-30 23:00:05 -05:00
GriffinR
1ff0b0efa9 Add missing collision constant usage 2022-01-29 21:13:46 -05:00
ghoulslash
0046283c04
Merge pull request #2045 from LOuroboros/patch-2
Updated GetBallThrowableState
2022-01-29 11:55:04 -05:00
LOuroboros
ef3db02c22
Updated GetBallThrowableState 2022-01-29 12:30:40 -03:00
Eduardo Quezada D'Ottone
3b4f219180
Merge pull request #2044 from SubzeroEclipse/BE_MoveDescriptions
Fixed format of move descriptions' labels
2022-01-28 18:24:51 -03:00
SubzeroEclipse
5f33989c42 Fixed format of move descriptions' labels 2022-01-27 21:50:12 +01:00
BuffelSaft
0a27b575dc Fix merge error in battle scripts 2022-01-27 17:24:11 +13:00
BuffelSaft
9d1800f53e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-01-27 17:18:51 +13:00
GriffinR
e30b16f0fd Fix Swap_HandleQuitSwappingResposne typo 2022-01-26 21:50:15 -05:00
LOuroboros
88b7326325 Ported the IE's flingPower item field and ItemId_GetFlingPower 2022-01-26 21:48:01 -03:00
LOuroboros
21244d6393 Modified and moved IsPinchBerryItemEffect 2022-01-26 21:45:24 -03:00
GriffinR
2efbd5f549
Merge pull request #1608 from GriffinRichards/fix-fieldmap
Fix some incorrect fieldmap names
2022-01-26 17:51:56 -05:00
GriffinR
4188dd405c
Merge pull request #1620 from LOuroboros/gBallSpriteTemplates
Used ball constants in gBallSpriteTemplates
2022-01-26 17:44:26 -05:00
LOuroboros
6470b0d004 Used ball constants in gBallSpriteTemplates 2022-01-26 18:36:21 -03:00
LOuroboros
b33f7aed8d Oopsie 2022-01-25 23:31:23 -03:00
LOuroboros
7916ff5f47 Further updated CanFling 2022-01-25 21:02:26 -03:00
GriffinR
dc7d86f026 Add new macro comments 2022-01-23 19:30:39 -05:00
GriffinR
2495d18132 Add missing :req, remove old macros 2022-01-23 18:52:04 -05:00
ghoulslash
bc94a2bb16
Merge pull request #1979 from AsparagusEduardo/BE_wildNaturalEnemies
Wild mon natural enemies in double wild battles
2022-01-23 18:43:12 -05:00
LOuroboros
8eaf0718ec Review changes
Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.
2022-01-23 19:13:04 -03:00
ghoulslash
a165f9926d canbestatused for psycho shift 2022-01-23 13:46:30 -05:00
ghoulslash
3e1ddf6b93
Merge pull request #2042 from AsparagusEduardo/BE_unnerveChecks
Removed redundant checks for Unnerve
2022-01-23 13:22:52 -05:00
ghoulslash
8bca2f290d
Merge pull request #2041 from AsparagusEduardo/BE_getBattlerAbility
Optimized use of GetBattlerAbility
2022-01-23 13:16:01 -05:00
laqieer
dc2e210ade
Install libpng using pacman instead of manual build for msys2 2022-01-23 17:31:54 +08:00
LOuroboros
a8a8c7e2fa Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2022-01-23 02:37:07 -03:00
GriffinR
9f2b6ab2f2
Merge pull request #1613 from Kurausukun/m4asymbols
Move M4A Track Definitions
2022-01-22 21:41:37 -05:00
Kurausukun
2cc301603e lmao whitespace 2022-01-22 21:30:39 -05:00
Kurausukun
3b756bfb3d fix compilation on modern 2022-01-22 20:38:41 -05:00
Kurausukun
317e302147 fix inconsistent indentation 2022-01-22 19:43:11 -05:00
Kurausukun
04013fbdf2 forgot we could do this 2022-01-22 19:41:31 -05:00