ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 09:24:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,143 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

3803 Commits

Author SHA1 Message Date
LOuroboros
21244d6393 Modified and moved IsPinchBerryItemEffect 2022-01-26 21:45:24 -03:00
LOuroboros
8eaf0718ec Review changes 
Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.
 2022-01-23 19:13:04 -03: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
Eduardo Quezada D'Ottone
e880e4afdd
Merge branch 'battle_engine' into be_recalc_turn_order_after_actions 2022-01-22 19:01:45 -03:00
Eduardo Quezada D'Ottone
6aabe58649
Merge branch 'battle_engine' into magician 2022-01-15 13:06:13 -03:00
ghoulslash
46c2a9ada5
Merge pull request #2033 from LOuroboros/galarianZenMode 
Allow Galarian Darmanitan's Zen Mode to work
 2022-01-13 11:42:54 -05:00
ghoulslash
543252bc6c
Merge pull request #2034 from LOuroboros/proteanMsgboxFlush 
Tweaked Protean's effect's InGame appearance
 2022-01-13 11:42:31 -05:00
LOuroboros
a4f0de5106 Removed the last bits of HOLD_EFFECT_GRACIDEA 2022-01-12 01:54:29 -03:00
LOuroboros
b2965e5522 Added a pause to BattleScript_ProteanActivates 2022-01-11 20:15:47 -03:00
LOuroboros
24b5a5709a Allow Galarian Darmanitan's Zen Mode to work 2022-01-10 23:01:18 -03:00
Eduardo Quezada D'Ottone
97baedbd5e
Merge pull request #1923 from WiserVisor/battle_engine 
Added Sky Drop to Battle Engine
 2022-01-07 18:14:40 -03:00
Eduardo Quezada D'Ottone
221e38ff86
Merge pull request #1957 from ghoulslash/be/ability_popup 
Ability Popup Fixes + Longer Ability Names config
 2022-01-01 19:39:55 -03:00
Eduardo Quezada D'Ottone
5b54986e6b
Merge pull request #1980 from LOuroboros/multiBattles 
Multi battle updates
 2021-12-29 22:09:06 -03:00
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
ghoulslash
770224d341 increase TEXT_BUFF_ARRAY_COUNT for expanded ability names 2021-12-23 18:58:15 -05:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine 2021-12-23 15:29:10 -08: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
0a95a31ee9 fix formatting 2021-12-23 08:44:54 -05:00
LOuroboros
713d97891f
Update include/constants/battle_config.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-12-22 21:32:10 -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
LOuroboros
cb44de13b3 B_NEW_MULTI_BATTLE_DEFEAT_CONDITION -> B_MULTI_BATTLE_WHITEOUT 2021-12-19 20:53:57 -03: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
a57043b589
Merge pull request #1983 from sphericalice/last_ball_refactor 
Refactor CanThrowLastUsedBall and related functions
 2021-12-19 20:21:50 -03:00
Eduardo Quezada D'Ottone
6d17156f74
Merge pull request #1934 from BuffelSaft/fix-burmy 
Fix Burmy form change
 2021-12-19 20:18:19 -03:00
LOuroboros
ffe35fbb06 Updated defeat condition on multi battles 2021-12-19 08:30:43 -03:00
Eduardo Quezada D'Ottone
a075cca448
Merge branch 'battle_engine' into fix-burmy 2021-12-18 13:38:12 -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
sphericalice
5c02facde4 Use more specific enum names for throwable Balls 2021-12-05 23:17:44 +00:00
sphericalice
3db871c49a Refactor CanThrowLastUsedBall and related functions 2021-12-05 23:10:05 +00: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
ghoulslash
7a7c6afc39 larger ability popup, fix ability name printing/clearing, and config for longer ability names 2021-11-29 12:42:01 -05:00
ghoulslash
d108f77aa4 revert ai item usage code 2021-11-28 13:12:56 -05: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
kleeenexfeu
9b25e0147c
Update include/constants/battle_config.h 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-11-23 14:35:37 +01:00
kleeenexfeu
f2755ad970
reword B_RECALC_TURN_AFTER_ACTIONS explanation 2021-11-23 14:28:52 +01:00
kleeenexfeu
84e6e083f7
hate the explanations about turn order ._. 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-11-23 14:24:30 +01:00
kleeenexfeu
6ceffaaf3e recalculate turn order after relevant actions 2021-11-23 13:46:36 +01:00
kleeenexfeu
1a5d3191e2 battle_engine merge 2021-11-23 13:38:36 +01:00