ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-09 05:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,874 Commits 1 Branch 0 Tags 235 MiB
312583de5e
Commit Graph

637 Commits

Author SHA1 Message Date
BuffelSaft
8d432e4e34 Undo form changes on capture 
This will revert busted Mimikyu, Schooling Wishiwashi etc. to their base forms when caught.
 2021-07-11 12:51:27 +12:00
LOuroboros
588b3638d3 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into inner_focus 2021-06-07 19:22:20 -03:00
LOuroboros
8726107d42 Removed BattleScript_FlinchPrevention 
Also reverted a nonsensical change in SetMoveEffect's case MOVE_EFFECT_FLINCH.
 2021-06-07 19:18:15 -03:00
ultima-soul
092f02f119 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-06-07 12:00:23 -07:00
ultima-soul
2563bc5c83
Merge pull request #1521 from DizzyEggg/largeexp 
Allow larger exp gains
 2021-06-06 13:33:33 -07:00
ultima-soul
3448e19275
Merge pull request #1459 from ExpoSeed/BE/rename-flags 
Rename flags
 2021-06-04 19:33:45 -07:00
ExpoSeed
12a155bd9a FLAG_DMG_2X_IN_AIR can now hit targets 2021-06-04 21:28:28 -05:00
ExpoSeed
15914d7af8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/rename-flags 2021-06-04 19:00:29 -05:00
ultima-soul
6edec5bc3d
Merge pull request #1437 from LOuroboros/oblivious 
Tweaked Oblivious
 2021-06-04 16:51:38 -07:00
DizzyEggg
4b744374c8 Allow larger exp gains 2021-06-03 23:17:44 +02:00
DizzyEggg
85ff866998 Fix FlameBurst 2021-06-03 09:50:43 +02:00
LOuroboros
d48a6e00d4 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into oblivious 2021-06-01 18:15:01 -03:00
amiosi
b588e94395 more requested changes 2021-05-28 15:05:33 -04:00
amiosi
7b530a34bf finish requested changes 2021-05-27 20:14:46 -04:00
amiosi
36c977d9eb oopsie 2021-05-27 16:01:34 -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
c3e28e9b1a merge with be 2021-05-23 12:22:52 -06:00
gAlfonso-bit
ffbbc88801
BUGFIX: battle scripts (#1436) 2021-05-23 09:35:03 -05:00
ultima-soul
e864c39a5d Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync 2021-05-04 10:04:35 -07:00
ghoulslash
fd3605b023
Merge pull request #1443 from AmbientDinosaur/patch-1 
Keen Eye evasion ignoring effect from Gen 6
 2021-05-04 09:49:56 -06:00
ghoulslash
e803b42827
Merge pull request #1467 from LOuroboros/gravity_acc 
Added Gravity's missing acc boost
 2021-05-04 09:32:58 -06:00
ghoulslash
22fc9733e5
Merge pull request #1480 from BuffelSaft/big_root_fix 
Make Big Root affect absorb moves
 2021-05-04 09:32:18 -06:00
BuffelSaft
5d177f0a15 Make Big Root affect absorb moves 
Big Root should increase the HP recovered by Absorb, Giga Drain etc.
 2021-05-04 23:20:22 +12:00
LOuroboros
3dbb096393 Added Gravity's missing acc boost 2021-04-28 23:31:58 -03:00
ultima-soul
14a0303e2f Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-27 18:36:37 -07:00
GriffinR
cd2a99b7c4 Doc storage - misc cleanup, some item/cursor 2021-04-17 13:33:29 -04:00
GriffinR
f6016838b1
Merge pull request #1397 from GriffinRichards/doc-moremisc 
Clean up battle scripts
 2021-04-10 12:41:35 -04:00
Kurausukun
3e725272fc standardize "grey" to "gray" 2021-04-09 22:39:34 -04:00
ExpoSeed
e11fd352fa
Merge pull request #1364 from ghoulslash/two-turn 
Fix Two-Turn Moves Failing Innapropriately
 2021-04-07 16:12:13 -05:00
ExpoSeed
8494306d1d Rename flags 2021-04-07 16:07:30 -05:00
GriffinR
f4d8a91ba4 Misc battle script cleanup 2021-04-03 14:07:31 -04:00
GriffinR
9ea9ffde09 Add remaining multistring chooser constants 2021-04-03 11:49:06 -04:00
LOuroboros
4d773ef40c Removed the BattleScript from Inner Focus 
Any questions shall be directed to Mr. Junichi Masuda.
 2021-04-03 00:17:30 -03:00
ultima-soul
939608f5b8 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-02 13:16:40 -07:00
AmbientDinosaur
d310edda4b
Keen Eye evasion ignoring effect from Gen 6 2021-04-02 19:25:07 +02:00
GriffinR
c9d3b26ff7 Label miss string indexes 2021-04-02 02:12:46 -04:00
LOuroboros
ed74430d26 Added a variation of BattleScript_NotAffected 
This one triggers the Ability PopUp.
 2021-03-31 23:33:51 -03:00
LOuroboros
da24b9c251 Tweaked Oblivious 
-Made it unaffected by a foe's taunt.
-Changed the Battle Script it calls when a foe tries to infatuate.
 2021-03-31 21:20:00 -03:00
GriffinR
8c6e89e994 Bit shifts from hex to decimal 2021-03-30 17:38:09 -04:00
ghoulslash
a595b213b4 merge with be 2021-03-28 17:29:22 -06:00
GriffinR
7a5c6d4d86 Standardize Friendship/Happiness 2021-03-27 17:27:20 -05:00
ultima-soul
5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07:00
amiosi
b081a00891 Merge branch 'battle_engine' into old_findings 2021-03-13 09:59:09 -05:00
Eduardo Quezada D'Ottone
292993e360
Merge pull request #1338 from ghoulslash/ripen 
Add Ripen and Finish Gen4 Berries
 2021-03-13 11:16:42 -03:00
ghoulslash
3f9bf5acc0 merge with be 2021-03-09 10:33:48 -07:00
Evan
2ccdf1d89e merge with be. magic guard checks 2021-03-03 09:21:06 -07:00
ultima-soul
e5fa583a08
Merge pull request #1334 from ghoulslash/gen8_abilities 
More Gen 8 Abilities
 2021-03-01 10:40:09 -08:00
Evan
6cb8c6309a merge with be 2021-03-01 11:28:51 -07:00
Evan
55b8538f68 merge with be 2021-03-01 11:22:37 -07:00