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
Eduardo Quezada D'Ottone
b4cf674fa1
Moved ITEM_EXPANSION define to global.h to fix reading from other branches like Battle Engine
2020-11-09 12:38:53 -03:00
Eduardo Quezada D'Ottone
ddb6142709
Review changes 3.
2020-11-08 21:08:58 -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
Evan
980f208b78
use NATIONAL_DEX_COUNT for critical capture odds
2020-11-08 14:07:43 -07:00
Eduardo Quezada D'Ottone
2e01654eb9
Plate type data and hold effect.
2020-11-08 01:47:05 -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
Eduardo Quezada D'Ottone
68627882a5
Merge remote-tracking branch 'pret/master' into PE-pretSync
2020-11-07 15:00:10 -03:00
Eduardo Quezada D'Ottone
8d86169283
Merge remote-tracking branch 'pret/master' into IE-pretSync
2020-11-07 14:54:52 -03:00
Eduardo Quezada D'Ottone
09a5d6c722
Implemented Wish Mega Evolution
2020-11-07 10:13:32 -03:00
Eduardo Quezada D'Ottone
cb6802f01e
Standarized naming schemes.
2020-11-06 20:15:28 -03:00
Eduardo Quezada D'Ottone
5e33281350
Support for gender difference mon icons.
2020-11-06 17:48:03 -03:00
Eduardo Quezada D'Ottone
d7fbaa6cbf
Support for gender palettes.
2020-11-06 17:12:57 -03:00
MCboy
e31158d017
add spaces around - and remove comment from include in battle.h
2020-11-06 23:29:52 +03:30
Eduardo Quezada D'Ottone
3849f7dd5d
Female Eevee backsprite.
2020-11-06 16:45:25 -03:00
MCboy
3b91735e63
use constants for ball throw count
2020-11-06 22:59:46 +03:30
Eduardo Quezada D'Ottone
4d4b111327
Front pic gender differences for Eevee
2020-11-06 16:21:45 -03:00
Evan
b3d1e8b5b8
turn crit capture odds into a ratio
2020-11-03 08:57:11 -07:00
PikalaxALT
99dd461bef
Merge pull request #1189 from aaaaaa123456789/reverts
...
Undo PokeCodec's PRs and port changes
2020-11-03 09:28:45 -05:00
Eduardo Quezada D'Ottone
0c6dc6abab
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
...
# Conflicts:
# graphics/pokemon/burmy/footprint.png
# graphics/pokemon/gastrodon/footprint.png
# graphics/pokemon/rotom/footprint.png
# graphics/pokemon/shellos/footprint.png
# graphics/pokemon/wormadam/footprint.png
# include/constants/species.h
# src/data/pokemon/base_stats.h
2020-11-03 00:13:51 -03:00
Kurausukun
6545745e59
Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts
2020-11-02 18:43:40 -05:00
Kurausukun
8bf401c227
address comments
2020-11-02 18:43:11 -05:00
ultima-soul
1e283e9dbf
Merge pull request #551 from LOuroboros/gen5_footprints
...
Added footprints for the Gen. 5 species
2020-11-02 10:28:06 -08:00
ultima-soul
104b48986c
Merge pull request #538 from AsparagusEduardo/PE-IsUltraBeast
...
Created macro used to detect Ultra Beasts.
2020-11-02 09:53:28 -08:00
ExpoSeed
c2e8f51e35
Merge pull request #145 from AsparagusEduardo/IE-Config
...
Item Expansion config file.
2020-11-02 11:31:51 -06:00
Evan
e7372e7c5b
add B_ prefix to critical capture configs
2020-11-01 21:50:34 -07:00
Evan
59692e8e7f
styling fix
2020-11-01 21:08:58 -07:00
ExpoSeed
d6cbbc71a5
Merge pull request #29 from AsparagusEduardo/PR-CommentGen4Abilities
...
Toggle options for abilities and Egg Groups.
2020-11-01 21:07:24 -06:00
Evan
a6c3d950f6
critical capture config option and catching charm
2020-11-01 16:15:42 -07:00
Eduardo Quezada D'Ottone
5a201f006f
More exp options in battle_config ( #530 ) from MandL27
2020-11-01 19:41:29 -03:00
Eduardo Quezada D'Ottone
b372ab1c34
Fixed label for Egg Group config.
2020-11-01 14:50:29 -03:00
LOuroboros
7cf3c256cd
Added footprints for the Gen. 5 species, thanks to Blackforest
2020-11-01 09:44:05 -03:00
ExpoSeed
1b65e1a1f0
Merge pull request #520 from ghoulslash/battle_engine
...
Add Toggle Healthbox Visibility Feature
2020-10-31 23:07:39 -05:00
GriffinR
be1685c87f
Use constants for menu info icon table
2020-10-29 16:34:33 -04:00
LOuroboros
6435158742
Added footprints for the Gen. 4 species
2020-10-27 09:38:04 -03:00
Eduardo Quezada
ed6fd6c964
Fixed compile
2020-10-26 22:37:01 -03:00
Eduardo Quezada
2c098d8294
Merge branch 'pokemon_expansion' into PE-Ultima-Forms
...
# Conflicts:
# src/data/pokemon/base_stats.h
2020-10-26 20:06:37 -03:00
aaaaaa123456789
1c3d75f673
Merge branch 'master' into reverts
2020-10-26 12:16:36 -03:00
Kurausukun
fe40c0c466
re-match BattleIntroOpponent1SendsOutMonAnimation
...
a lot of functions and a bit of data had to be moved from battle_main.c
to battle_util.c; I have added a note to battle_util.c stating the
reason for this
2020-10-26 05:52:00 -04:00
Kurausukun
83846b913a
port sub_806F160 fakematch fix
2020-10-26 00:01:53 -04:00
Eduardo Quezada
641daafb3f
Fixed identation for better readability.
2020-10-25 12:34:48 -03:00
Eduardo Quezada
4aa6442cd4
Fixed price mixed up.
2020-10-25 01:28:14 -03:00
LOuroboros
61b41f3599
Removed unused labels for expanded TMs
2020-10-24 09:57:11 -03:00
Eduardo Quezada
13a6b70e8c
Updating Egg Groups.
2020-10-24 08:04:30 -03:00
Eduardo Quezada
67817ff9b9
Updated abilities.
2020-10-24 07:58:58 -03:00
Eduardo Quezada
ae60ae8a2d
Review changes.
2020-10-24 03:07:45 -03:00
Eduardo Quezada
b5834b617d
Merge branch 'BattleEngine' into PR-LGPE_IOA_Moves
...
# Conflicts:
# src/data/text/move_descriptions.h
2020-10-24 00:36:29 -03:00
Eduardo Quezada
ced1ccd659
Created macro to be used by Beast Balls
2020-10-23 23:16:37 -03:00
