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

253 Commits

Author SHA1 Message Date
BuffelSaft
e59be67023 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2021-10-15 16:25:11 +13: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
BuffelSaft
07bdd2ffe6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2021-10-09 15:18:51 +13: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
BuffelSaft
2f03ac31b9 Multihit refactor and Parental Bond 
Port multihit system from the CFRU, implement Parental Bond, refactor certain moves as required and implement all remaining multi hit moves except Dragon Darts.
 2021-09-23 14:31:21 +12: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
LOuroboros
d2bcc2ad5b Added configs for modern post-battle stat calcs 2021-09-01 00:31:50 -03: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
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
amiosi
fc81994579 Merge branch 'battle_engine' into old_findings 2021-05-27 15:28:02 -04:00
ghoulslash
a595b213b4 merge with be 2021-03-28 17:29:22 -06:00
amiosi
b081a00891 Merge branch 'battle_engine' into old_findings 2021-03-13 09:59:09 -05:00
LOuroboros
68980cf18c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-03-10 03:58:21 -03:00
ghoulslash
d5004638a9
Update include/constants/battle_config.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-03-09 16:35:47 -07:00
ghoulslash
3f9bf5acc0 merge with be 2021-03-09 10:33:48 -07:00
Evan
55649a67cc Merge branch 'terrain' of https://github.com/ghoulslash/pokeemerald into terrain 2021-03-01 11:23:05 -07:00
Evan
55b8538f68 merge with be 2021-03-01 11:22:37 -07:00
ultima-soul
f6147ee054
Merge pull request #1356 from ghoulslash/tailwind_turns 
Update tailwind timer To Gen5
 2021-03-01 08:51:40 -08:00
amiosi
1df295a582 battle config and zippy zap 
plus fix mirror move mistakes
 2021-02-11 17:11:07 -05:00
amiosi
c0ba7436af water shuriken and howl 2021-02-11 16:20:13 -05:00
Evan
c003f1c023 check move effectiveness with status effects 2021-01-26 15:41:59 -07:00
Evan
5aff5333dc fix B_MEMENTO_FAIL comment 2021-01-21 12:05:01 -07:00
Evan
bfb7333507 memento gen4 failing 2021-01-21 12:03:30 -07:00
Evan
16d54b6d32 merge with be, add form checks to CanBattlerGetOrLoseItem 2021-01-20 14:28:03 -07:00
ExpoSeed
61db82e64a
Revert "Included global.h into battle_config.h" 2021-01-19 22:55:08 -06:00
ghoulslash
9d9da6a485
Update include/constants/battle_config.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-01-19 15:01:51 -07:00
Evan
b576eb5247 fix var_terrain default, wording 2021-01-19 13:26:36 -07:00
LOuroboros
77d714ead5 Included global.h into battle_config.h 
Fixes the dupplicated defines issue.
 2021-01-16 20:37:34 -03:00