GriffinR
|
de153a67cf
|
Merge pull request #1253 from LOuroboros/patch-1
sanityIsBagEgg -> sanityIsBadEgg
|
2020-11-16 14:57:16 -05:00 |
|
LOuroboros
|
cad5b57b42
|
sanityIsBagEgg -> sanityIsBadEgg
Fixed a typo.
Lunos#4026
|
2020-11-16 15:36:38 -03:00 |
|
ExpoSeed
|
e5f043ff72
|
Fix grammar
|
2020-11-15 16:28:09 -06:00 |
|
ExpoSeed
|
3f157b5293
|
Document bugged IV inheritance difference
|
2020-11-15 16:24:19 -06:00 |
|
Eduardo Quezada D'Ottone
|
fb8a6b408f
|
Merge pull request #1224 from AsparagusEduardo/BE-PECompat
Fixed compatibility with Pokémon Expansion
|
2020-11-15 14:16:26 -03:00 |
|
Eduardo Quezada D'Ottone
|
4da357aef4
|
Fixed compatibility with Pokémon Expansion
|
2020-11-15 13:35:02 -03:00 |
|
ghoulslash
|
686ff59b11
|
Merge pull request #13 from AsparagusEduardo/PR-LGPE_IOA_Moves
LGPE & Isle of Armor move data.
|
2020-11-15 08:29:10 -07:00 |
|
Eduardo Quezada D'Ottone
|
f0154028ff
|
Review changes 2
|
2020-11-14 09:01:43 -03:00 |
|
Eduardo Quezada D'Ottone
|
e87f0f1ddb
|
Review changes
|
2020-11-13 14:51:50 -03:00 |
|
ultima-soul
|
236d7145ae
|
Merge pull request #1220 from AsparagusEduardo/BE-SteelResistances
Added config option for Steel type resistances.
|
2020-11-12 23:25:21 -08:00 |
|
ultima-soul
|
c3423b4212
|
Merge pull request #1206 from ExpoSeed/type-changing-moves
Refactor move effects for type changing moves
|
2020-11-12 19:10:48 -08:00 |
|
luckytyphlosion
|
5029c90979
|
Missing inc files in asm/*.s and data/*.s will raise an actual error message.
|
2020-11-12 11:04:38 -05:00 |
|
Eduardo Quezada D'Ottone
|
4b9d0d8e24
|
Added config option for Steel type resistances.
|
2020-11-11 17:48:02 -03:00 |
|
ExpoSeed
|
0912577ea1
|
Merge pull request #575 from AsparagusEduardo/BE-WishMegaEvo
Implemented Wish Mega Evolution
|
2020-11-11 11:05:06 -06:00 |
|
Eduardo Quezada D'Ottone
|
98d3427e62
|
Prevent Ability Popup overwrites #1218 from ghoulslash
|
2020-11-10 17:34:33 -03:00 |
|
Eduardo Quezada D'Ottone
|
e021a4aa87
|
Critical Capture Config Option And Catching Charm #556 from ghoulslash
Critical Capture Config Option And Catching Charm
|
2020-11-10 17:31:08 -03:00 |
|
Eduardo Quezada D'Ottone
|
e6f8d57f08
|
Merge remote-tracking branch 'RHH/battle_engine' into BE-WishMegaEvo
# Conflicts:
# include/constants/battle_string_ids.h
|
2020-11-10 17:28:17 -03:00 |
|
ExpoSeed
|
429df3c319
|
Merge pull request #571 from LOuroboros/new_surf_pal
Added functionality to the B_NEW_SURF_PARTICLE_PALETTE anim. config label
|
2020-11-10 11:37:07 -06:00 |
|
ExpoSeed
|
17f7af747c
|
Merge pull request #569 from LOuroboros/anim_settings_label_fixes
Fixed anim. settings labels in src/battle_anim.c
|
2020-11-10 11:36:27 -06:00 |
|
ghoulslash
|
6b6750028a
|
Merge pull request #1216 from LOuroboros/intimidate
Tweaked Intimidate a little
|
2020-11-10 10:34:36 -07:00 |
|
LOuroboros
|
bb4f00737e
|
B_EXPANDED_INTIMIDATE->B_UPDATED_INTIMIDATE
|
2020-11-10 14:26:47 -03:00 |
|
Evan
|
0683dc9c3f
|
longer ability popup delay to prevent overwriting
|
2020-11-10 10:05:11 -07:00 |
|
Evan
|
de0518121e
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine
|
2020-11-10 09:00:30 -07:00 |
|
LOuroboros
|
a25190f357
|
A few things.
-Introduced a Gen. 8 styled text string for Intimidate
-Added an ability popup to BattleScript_IntimidatePrevented
|
2020-11-10 10:34:51 -03:00 |
|
LOuroboros
|
e179b9b5fe
|
Updated Intimidate to Gen. 8 standard
|
2020-11-10 10:18:16 -03:00 |
|
ExpoSeed
|
ebaeeb7594
|
Merge pull request #1213 from AsparagusEduardo/BE-GlobalDefine
Moved BATTLE_ENGINE define to global.h to fix reading from other bran…
|
2020-11-09 12:01:44 -06:00 |
|
Eduardo Quezada D'Ottone
|
33ed87e2cb
|
Capitalization
|
2020-11-09 14:52:18 -03:00 |
|
Eduardo Quezada D'Ottone
|
3a984136e7
|
Updated comment.
|
2020-11-09 14:50:18 -03:00 |
|
GriffinR
|
7172ea35f9
|
Merge pull request #1248 from luckytyphlosion/master
Bugfix for ChooseMoveOrAction_Doubles.
|
2020-11-09 12:17:41 -05:00 |
|
GriffinR
|
19fa021c63
|
Merge pull request #1249 from luckytyphlosion/master
Add missing files to .gitattributes.
|
2020-11-09 12:13:45 -05:00 |
|
Eduardo Quezada D'Ottone
|
9eea1cc296
|
Updated to use internal Gen 8 move data.
|
2020-11-09 13:34:38 -03:00 |
|
Eduardo Quezada D'Ottone
|
df4d927e31
|
Moved BATTLE_ENGINE define to global.h to fix reading from other branches
|
2020-11-09 12:45:31 -03:00 |
|
luckytyphlosion
|
8a780977a8
|
Add missing files to .gitattributes.
Only *.sed is required, all other files are listed to be explicit.
|
2020-11-08 20:13:21 -05:00 |
|
Eduardo Quezada D'Ottone
|
ddb6142709
|
Review changes 3.
|
2020-11-08 21:08:58 -03:00 |
|
Eduardo Quezada D'Ottone
|
255a14affb
|
Review changes 2.
|
2020-11-08 21:03:50 -03:00 |
|
Eduardo Quezada D'Ottone
|
35d5324324
|
Review changes.
|
2020-11-08 21:02:34 -03:00 |
|
Evan
|
03f480fa17
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine
|
2020-11-08 15:21:48 -07:00 |
|
ultima-soul
|
8e30647ca1
|
Merge pull request #1205 from ultima-soul/battle_engine_sync
Sync Battle Engine Upgrade to Upstream
|
2020-11-08 14:18:16 -08:00 |
|
Evan
|
cdad1e7101
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine
|
2020-11-08 14:07:50 -07:00 |
|
Evan
|
980f208b78
|
use NATIONAL_DEX_COUNT for critical capture odds
|
2020-11-08 14:07:43 -07:00 |
|
ExpoSeed
|
7ea34968f9
|
Add damage calc for plates
|
2020-11-08 01:57:52 -06:00 |
|
ExpoSeed
|
d2566c8988
|
Refactor Multi-Attack, Judgment, and Techno Blast to use the same move effect
|
2020-11-07 23:34:04 -06:00 |
|
ultima-soul
|
99fdc13e61
|
Merge branch 'master' into battle_engine_sync
|
2020-11-07 15:59:20 -08:00 |
|
luckytyphlosion
|
4b748d32cc
|
Bugfix for ChooseMoveOrAction_Doubles.
|
2020-11-07 18:21:17 -05:00 |
|
luckytyphlosion
|
a29b18ed2f
|
Merge branch 'master' of https://github.com/pret/pokeemerald
|
2020-11-07 18:06:37 -05:00 |
|
ExpoSeed
|
31b19400f9
|
Merge pull request #568 from LOuroboros/hurricane
Changed Hurricane's animation
|
2020-11-07 14:44:49 -06:00 |
|
Eduardo Quezada D'Ottone
|
09a5d6c722
|
Implemented Wish Mega Evolution
|
2020-11-07 10:13:32 -03:00 |
|
LOuroboros
|
ea99195194
|
Added functionality to the B_NEW_SURF_PARTICLE_PALETTE anim. config label
|
2020-11-06 22:29:20 -03:00 |
|
LOuroboros
|
d66b2fc820
|
Fixed anim. settings labels in src/battle_anim.c
|
2020-11-06 21:37:04 -03:00 |
|
LOuroboros
|
c66b77fbf8
|
Changed Hurricane's animation
|
2020-11-06 21:06:04 -03:00 |
|