ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-06 09:33:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,121 Commits 1 Branch 0 Tags 235 MiB
3debf0442d
Commit Graph

282 Commits

Author SHA1 Message Date
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
Eduardo Quezada D'Ottone
2ebe427a42 Merge branch 'BattleEngine' into BE_wildNaturalEnemies 
# Conflicts:
#	src/battle_controller_opponent.c
 2021-12-23 21:19:59 -03: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
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
LOuroboros
ffe35fbb06 Updated defeat condition on multi battles 2021-12-19 08:30:43 -03:00
ExpoSeed
d6747527da Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-12-16 21:44:01 -06: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
bbf7b62ceb Config for lost money after losing a battle 2021-12-11 23:03:50 -03:00
Eduardo Quezada D'Ottone
1708ac4b1b Wild mon that have a natural enemy or preys on other mon will attack them whem partnered in double wild battles. 2021-12-04 22:13:29 -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
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
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
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
LOuroboros
a01fd2eb7a Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2021-11-15 12:47:26 -03:00
LOuroboros
cbb6639f8d Fling tweaks 
-Updated and renamed VARIOUS_JUMP_IF_FLING_FAILS (now VARIOUS_JUMP_IF_NO_FLING_POWER)
-Updated BattleScript_EffectFling following Smogon's description of Fling's effect.
-Refactored BattleScript_FlingMentalHerb thanks to GetMentalHerbEffect
-No need to define flingPower when its value is 0
-Forced the target to eat a berry that was flung at them by overwriting their item with the berry thrown and restoring their original item after its effect finishes.
-Added a preproc config for Klutz.
 2021-11-15 12:40:10 -03:00
ghoulslash
8b296b97a8
Merge pull request #1887 from BuffelSaft/knock-off 
Fix Knock Off, add config
 2021-11-14 08:27:51 -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
LOuroboros
2fe015e5ce Implemented Fling 2021-11-13 10:27:05 -03: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
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
ultima-soul
fd4d0db912 Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into ball_effects 2021-11-10 18:02:00 -08:00
ghoulslash
a90cf4a501
Merge pull request #1724 from AsparagusEduardo/BE_TerrainMoves 
Moves affected by Terrain: Camouflage, Secret Power & Terrain Pulse
 2021-11-07 17:39:03 -05:00
Eduardo Quezada D'Ottone
8773e552ac Organized config and added failsafe to AnimTask_SetCamouflageBlend 2021-11-06 19:24:06 -03:00
Eduardo Quezada D'Ottone
1c4a0c205a Camouflage types config + extra terrains 2021-11-06 19:09:35 -03:00
Eduardo Quezada D'Ottone
b220da1d2a Updated NaturePowerMoves table for new terrains + added failsafe in case the terrain isn't defined in the table 2021-11-06 18:50:01 -03:00
Eduardo Quezada D'Ottone
e9804a5023 Secret Power animation config 2021-11-06 17:32:34 -03:00
Eduardo Quezada D'Ottone
328976bf81 Secret Power effect config 2021-11-06 17:05:13 -03:00
Eduardo Quezada D'Ottone
202827068c
a 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-11-05 21:25:42 -03:00
Eduardo Quezada D'Ottone
8e49e3e653 Config for Synchronize's interaction with toxic poisoning 2021-11-05 21:16:13 -03:00
Eduardo Quezada D'Ottone
6c70a6b872
Merge pull request #1863 from LOuroboros/soulDewBE 
Added a battle config for the Soul Dew
 2021-11-05 17:09:44 -03:00
ghoulslash
0b2542e447 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into smart_wild_ai 2021-11-05 09:46:12 -04:00
LOuroboros
d15eeeb8eb Fixed the comment for B_SOUL_DEW_BOOST 2021-11-05 10:37:41 -03:00
LOuroboros
671cbabc3d Added a battle config for the Soul Dew 2021-11-04 17:25:31 -03:00
BuffelSaft
6ce1f01b8c Hunger Switch and Aura Wheel 
Implement the ability Hunger Switch and the move Aura Wheel.
 2021-11-03 19:45:03 +13:00
ghoulslash
e2e31f0b74 skill swap config option for switchin abilities 2021-10-28 16:53:00 -04:00
ghoulslash
34e966fdee
Merge pull request #1815 from LOuroboros/hyperspaceFury 
Implemented Hyperspace Fury
 2021-10-28 13:20:33 -04:00
LOuroboros
1ab8c84f41 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury 2021-10-26 21:23:21 -03:00
Eduardo Quezada D'Ottone
773c773bac Merge remote-tracking branch 'RHH/battle_engine' into BE_ghostEscape 
# Conflicts:
#	include/constants/battle_config.h
 2021-10-26 20:35:01 -03:00
Eduardo Quezada D'Ottone
44625561e5 Taunt turn config 2021-10-24 20:21:54 -03:00
Eduardo Quezada D'Ottone
70aeaf288f Rough Skin damage config 2021-10-24 20:07:22 -03:00
Eduardo Quezada D'Ottone
8699db942b More ordering 2021-10-24 20:03:21 -03:00
Eduardo Quezada D'Ottone
71ff664700 Ordered config into new categories 2021-10-23 20:11:02 -03:00
Eduardo Quezada D'Ottone
d95351dd97 Merge branch 'BattleEngine' into BE_config 
# Conflicts:
#	include/constants/battle_config.h
 2021-10-23 19:46:33 -03:00
Eduardo Quezada D'Ottone
abb8a97d21
Merge pull request #1616 from LOuroboros/statCalcs 
Added configs for modern post-battle stat calcs
 2021-10-23 13:35:21 -03:00
Eduardo Quezada D'Ottone
9a8b88bdb3 Updated config description 2021-10-23 11:59:57 -03:00
LOuroboros
e7ad7319e3 Updated Glare 2021-10-17 12:03:35 -03:00
ghoulslash
c077091dbf small fixes, check GetCatchingBattler's semi-invulnerability 2021-10-15 14:57:26 -04:00
ghoulslash
ef19c8c415 fix gen define 2021-10-15 09:22:50 -04:00
ghoulslash
883a249836 config for catching semi-invulnerable mons 2021-10-15 09:20:32 -04:00
Eduardo Quezada D'Ottone
c3f8b77d82 Setting for pre-Gen6 Hidden Power Damage. 2021-10-10 20:26:38 -03:00
Eduardo Quezada D'Ottone
903c4cbf68 Config for Blizzard + Hail 2021-10-09 23:52:37 -03:00
ghoulslash
658235c03d merge with be 2021-10-06 14:33:26 -04:00
ghoulslash
ee3a2c97ee Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball 2021-10-06 13:54:40 -04:00
ultima-soul
ce4375a10c Ported new Ball catch rate modifier effects from Item Expansion. 2021-10-06 10:28:18 -07:00
ghoulslash
245ef1ad2d
Merge pull request #1715 from AsparagusEduardo/BE_ShadowTag 
Config for Shadow Tag vs Shadow Tag
 2021-10-06 09:02:58 -04:00
Eduardo Quezada D'Ottone
978f73475b Config for Shadow Tag vs Shadow Tag 2021-10-02 19:01:11 -03:00
LOuroboros
f3ded43a88 Implemented Battle Bond 2021-10-01 22:49:17 -03:00
LOuroboros
1b039062da Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-09-25 22:20:34 -03:00
ghoulslash
33972b5493 merge with be 2021-09-23 12:04:13 -04:00
ghoulslash
d738297f24 merge with be 2021-09-22 16:26:09 -04:00
Eduardo Quezada D'Ottone
287ffff2e2
Merge branch 'battle_engine' into burmy-form-change 2021-09-21 22:34:37 -03:00
ghoulslash
faa963fd04 merge with be 2021-09-17 09:07:38 -04:00
ghoulslash
ac42b19de7 some formatting fixes 2021-09-16 11:54:27 -04:00
ghoulslash
d7938bc2dc Merge branch 'prankster' of github.com:ghoulslash/pokeemerald into prankster 2021-09-09 09:44:25 -04:00
ghoulslash
b8a71cabd1 merge with be 2021-09-09 09:44:18 -04:00
ghoulslash
933696b3cd merge with be 2021-09-03 17:41:00 -04:00
ExpoSeed
5a5c257f68 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-09-02 21:43:20 -05:00
LOuroboros
d2bcc2ad5b Added configs for modern post-battle stat calcs 2021-09-01 00:31:50 -03:00
ExpoSeed
0f99d9d4c6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-08-30 13:26:40 -05:00
ghoulslash
d218322b2c merge with be 2021-08-12 01:26:13 -04:00
BuffelSaft
30c983d9ca Define Burmy forms in battle engine 
Title. BE needs these to compile on its own.
 2021-08-08 13:14:51 +12:00
ghoulslash
0a0687ae78 add smart wild AI 2021-07-27 09:49:39 -06:00
LOuroboros
f1195e1884 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-07-27 09:08:52 -03:00
ghoulslash
45d4cee243 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball 2021-07-18 11:11:03 -06:00
ExpoSeed
fb69b65337 Fix redefinition error in battle_config.h 2021-07-02 14:36:55 -05:00
ghoulslash
c06029bc72 add last used ball 2021-06-25 13:37:59 -06:00
ExpoSeed
c8fc141287 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-06-10 11:54:20 -05:00
MissingNoL
bfc66a21cc gBattlescriptCurrInstr[3] is not reading species parameter 2021-06-06 19:14:11 -07:00
amiosi
b588e94395 more requested changes 2021-05-28 15:05:33 -04:00
amiosi
f7651fd592 most fixes from requested changes 2021-05-27 15:55:19 -04:00