LOuroboros
|
ce7815ebcc
|
Update pokemon.h
|
2021-12-28 15:11:52 -03:00 |
|
Eduardo Quezada D'Ottone
|
7bffe6d1d5
|
Merge pull request #2004 from ghoulslash/be/sports
Add sport effects back
|
2021-12-24 18:59:50 -03:00 |
|
ghoulslash
|
93a7e139ec
|
merge w be
|
2021-12-24 09:40:12 -05:00 |
|
Eduardo Quezada D'Ottone
|
67697d2de3
|
Merge pull request #1582 from ghoulslash/smart_wild_ai
Smart Wild AI Option
|
2021-12-23 20:18:18 -03:00 |
|
ghoulslash
|
05f91bc243
|
Update include/constants/battle_config.h
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2021-12-20 14:06:32 -05:00 |
|
ghoulslash
|
02fe96cc08
|
fix config settings
|
2021-12-20 13:06:23 -05:00 |
|
Eduardo Quezada D'Ottone
|
4ab4250d5d
|
Merge branch 'battle_engine' into be/sports
|
2021-12-19 20:42:15 -03:00 |
|
Eduardo Quezada D'Ottone
|
7ca07527fa
|
Config for HP bars moving faster for higher HP amounts. Credit to Dat.H
|
2021-12-12 12:33:49 -03:00 |
|
Eduardo Quezada D'Ottone
|
aa2b2e6a70
|
Merge pull request #1929 from ultima-soul/battle_engine_sync
Battle Engine Upstream Sync
|
2021-12-09 20:02:45 -03:00 |
|
ultima-soul
|
a5afdac0ae
|
Resolved review suggestions for upstream Battle Engine sync.
|
2021-12-08 12:08:16 -08:00 |
|
DizzyEggg
|
97539d7443
|
Merge pull request #1951 from ghoulslash/be/sheercold
Ice Types immune to Sheer Cold
|
2021-12-06 14:12:06 +01:00 |
|
ghoulslash
|
c0e408bfab
|
fix aqua ring heal anim
|
2021-12-05 14:44:22 -05:00 |
|
ultima-soul
|
7369f60c06
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
|
2021-12-03 17:30:45 -08:00 |
|
ultima-soul
|
23bf41713c
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-12-01 20:17:08 -08:00 |
|
LOuroboros
|
e7bef25fb1
|
Updated hold_effects.h
|
2021-12-01 13:32:43 -03:00 |
|
ultima-soul
|
0312c5be8b
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-11-27 21:38:26 -08:00 |
|
ghoulslash
|
e2af9ec3b4
|
ice type immunity to sheer cold
|
2021-11-26 11:49:49 -05:00 |
|
ghoulslash
|
5c52abd856
|
gen3 sport move functionality behind config
|
2021-11-23 21:20:32 -05:00 |
|
ghoulslash
|
e3ddad2d11
|
add sport effects back
|
2021-11-23 18:36:10 -05:00 |
|
ultima-soul
|
3ed51d6d91
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-11-21 10:40:26 -08:00 |
|
ghoulslash
|
3404039330
|
Merge pull request #1918 from kleeenexfeu/be_mega_evo_alter_turn
Mega Evolution alters turn order
|
2021-11-21 08:12:21 -05:00 |
|
ghoulslash
|
3fb62f74c6
|
fix rampage cancelling
|
2021-11-20 18:35:56 -05:00 |
|
kleeenexfeu
|
6402a7ab6e
|
follow suggestion
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2021-11-19 23:42:20 +01:00 |
|
kleeenexfeu
|
acddeeb1f9
|
follow suggestion
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2021-11-19 23:30:33 +01:00 |
|
kleeenexfeu
|
03a9f3f413
|
Mega Evolution alters turn order
|
2021-11-19 22:03:10 +01:00 |
|
GriffinR
|
b9fa18bdd4
|
Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros
|
2021-11-17 22:03:37 -05:00 |
|
GriffinR
|
ecb13cdbf7
|
Merge pull request #1550 from GriffinRichards/doc-pokenav
Document Pokénav
|
2021-11-17 14:47:34 -05:00 |
|
GriffinR
|
eb95ac0b9c
|
Document field_tasks
|
2021-11-17 14:44:42 -05:00 |
|
GriffinR
|
d414787932
|
Some TV clean-up
|
2021-11-16 16:22:17 -05:00 |
|
GriffinR
|
5d9c31a610
|
Label slot machine ids, fix GetPriceReduction
|
2021-11-16 15:43:52 -05:00 |
|
GriffinR
|
04cc923d6c
|
Handle optional arguments for warp commands, add WARP_ID_NONE
|
2021-11-16 10:53:00 -05:00 |
|
Eduardo Quezada D'Ottone
|
cc833ebb59
|
Created macro + config for always critting when using high-crit moves
|
2021-11-15 23:21:46 -03:00 |
|
Eduardo Quezada D'Ottone
|
a1bd6bd52f
|
Updated species that benefit from Leek
|
2021-11-15 22:30:20 -03:00 |
|
GriffinR
|
65d3b58374
|
Add PARTY_NOTHING_CHOSEN
|
2021-11-15 10:57:06 -05:00 |
|
ghoulslash
|
0e397c43fe
|
Merge pull request #1898 from AsparagusEduardo/BE_postIETweaks
Adjusted elements to simplify the conflicts between BE and IE
|
2021-11-15 08:27:28 -05:00 |
|
ghoulslash
|
8b296b97a8
|
Merge pull request #1887 from BuffelSaft/knock-off
Fix Knock Off, add config
|
2021-11-14 08:27:51 -05:00 |
|
GriffinR
|
f42eafc85b
|
Merge branch 'master' into doc-banim
|
2021-11-13 23:26:46 -05:00 |
|
GriffinR
|
9a932cd9c3
|
Merge pull request #1549 from GriffinRichards/doc-binterface
Document remaining symbols in battle_interface, palette, and save
|
2021-11-13 23:19:08 -05:00 |
|
GriffinR
|
b14fe9dce3
|
Merge pull request #1547 from GriffinRichards/doc-sounddata
Clean up sound, add CRY_MODE constants
|
2021-11-13 15:54:40 -05:00 |
|
Eduardo Quezada D'Ottone
|
bcbdb353f5
|
Adjusted elements to simplify the conflicts between BE and IE
|
2021-11-13 12:10:20 -03:00 |
|
ghoulslash
|
940a165be7
|
merge w be
|
2021-11-13 09:09:15 -05:00 |
|
ghoulslash
|
a4204e5491
|
Update include/constants/battle_config.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2021-11-13 08:50:24 -05:00 |
|
ghoulslash
|
c4efe06f38
|
wish update
|
2021-11-12 17:55:05 -05:00 |
|
ghoulslash
|
96fd8e696b
|
brick break gen 4 and 5 config. clears aurora veil
|
2021-11-12 15:00:21 -05:00 |
|
ultima-soul
|
294fecd57c
|
Merge pull request #1888 from ghoulslash/be/contrary
Fix Contrary Animation
|
2021-11-12 10:19:37 -08:00 |
|
ghoulslash
|
a26da51e9d
|
fix contrary animations for MOVE_EFFECT_statchange
|
2021-11-12 12:44:45 -05:00 |
|
ultima-soul
|
c5dabf34b8
|
Improve Serene Grace boost config comment.
|
2021-11-12 09:39:18 -08:00 |
|
ghoulslash
|
6214d8b625
|
rename config
|
2021-11-12 07:47:24 -05:00 |
|
BuffelSaft
|
bdbdd0564f
|
Fix Knock Off, add config
Added a config for Knock Off's damage boost. Also fixed the conditions it checks to do bonus damage.
|
2021-11-12 21:05:42 +13:00 |
|
ghoulslash
|
adc1413d98
|
add kings rock serene grace boost config
|
2021-11-11 17:48:15 -05:00 |
|