Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,596 Commits 1 Branch 0 Tags
Commit Graph

11596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xhyzi
60ce39543e Expanding Force 2021-06-15 16:29:06 +02:00
Xhyzi
5a094a3033 Snap Trap 2021-06-15 16:22:42 +02:00
GriffinR
69fb670955
Merge pull request #1464 from ExpoSeed/pret/map-header-flags 
Change map header flags to use a bitfield
 2021-06-13 18:12:40 -04:00
ExpoSeed
b6b0062bd6 Change map header flags to use a bitfield 2021-06-13 17:02:06 -05:00
GriffinR
b0dfaa92be
Merge pull request #1460 from luckytyphlosion/remove-temps 
Buildsystem no longer builds temporary files for C compilation by default, and other makefile optimizations.
 2021-06-13 17:51:17 -04:00
GriffinR
f85fb3af89
Merge pull request #1463 from sphericalice/item-eventscript-labels 
Rename item script labels to fit the established name scheme
 2021-06-13 08:32:52 -04:00
SphericalIce
0a94dba4a7 Rename item script labels to fit the established name scheme 2021-06-13 13:21:23 +01:00
MissingNoL
32c8de5eca Finished! 2021-06-12 21:23:56 -07:00
MissingNoL
721dbe9178 Implemented all PLG effects 2021-06-12 18:01:35 -07:00
MissingNoL
610b18bfdb Implemented Double Iron Bash's effect 2021-06-12 14:27:50 -07:00
MissingNoL
beb126b534 Implemented Zippy Zap's effect 2021-06-12 13:58:54 -07:00
ultima-soul
bca67ac683 Refactor Poke Ball code to not rely on Master Ball being the first item internally. 2021-06-11 18:22:50 -07:00
ultima-soul
b7706f1b99 Remove ball catch rate modifier effects. 2021-06-10 21:59:13 -07:00
ghoulslash
70fd98a009
Merge pull request #1541 from rh-hideout/DizzyEggg-patch-2 
Fix Imposter looplock
 2021-06-10 11:59:29 -06:00
ghoulslash
de21636f97
Merge pull request #1539 from rh-hideout/DizzyEggg-patch-1 
Fix mon shadow when caught and learn new move
 2021-06-10 11:59:10 -06:00
GriffinR
e308dc8236
Merge pull request #1462 from ExpoSeed/pret/more-gray-less-grey 
Remove remaining grey and replace with gray
 2021-06-10 13:01:55 -04: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
ExpoSeed
4d6e64b336 Review comments. 2021-06-10 11:48:26 -05:00
ExpoSeed
3ed06c2cc2 Remove remaining grey and replace with gray 2021-06-10 11:36:10 -05:00
BuffelSaft
e6a8faec1e Fix thawing moves 
Replace IsThawingMove with a move flag and add a check for it to CANCELLER_FROZEN. This makes thawing moves actually thaw the user.
 2021-06-10 23:48:18 +12:00
DizzyEggg
179ac9c1e1
Fix Imposter looplock 2021-06-10 13:45:24 +02:00
DizzyEggg
f27dcab784 Rage powder has powder moves qualities when forcing a target 2021-06-10 12:55:05 +02:00
DizzyEggg
c6f3b7f571
Merge pull request #1532 from LOuroboros/emergency_exit 
Fixed Emergency Exit
 2021-06-10 10:41:07 +02:00
Jaizu
4e98c268c1
Small change to hidden ability (#3) 2021-06-09 23:07:05 +02:00
DizzyEggg
1e855cf469
Fix mon shadow when caught and learn new move 
Fixes #1477
 2021-06-09 09:49:42 +02:00
DizzyEggg
540719c483 Add support for only one enemy pokemon in double battles start 2021-06-08 22:50:37 +02:00
ultima-soul
1ff3718d1f
Merge pull request #1446 from LOuroboros/inner_focus 
Tweaked Inner Focus
 2021-06-08 13:18:35 -07:00
LOuroboros
d849c31ee8 Followed Ghoulslash's suggestion 2021-06-08 11:56:03 -03:00
ghoulslash
a683c698fb
Merge pull request #1524 from Jaizu/patch-13 
Change the ability popup sound
 2021-06-08 08:41:41 -06:00
DizzyEggg
4b29ae39ad Allow one mon double battles 2021-06-08 16:40:47 +02:00
DizzyEggg
59ea75f99f Fix Ability-popup lag 2021-06-08 12:56:38 +02:00
DizzyEggg
e2f14d43db Fix Gravity's animation 2021-06-08 12:13:40 +02:00
ExpoSeed
0b225b3f5c
Merge pull request #1534 from ultima-soul/master_sync 
Master Upstream Sync
 2021-06-07 23:52:10 -05:00
ultima-soul
425746763a Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 20:08:43 -07:00
ultima-soul
f3f4d8e608 Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 19:52:20 -07:00
LOuroboros
2c1237365b Fixed Emergency Exit 
The ability was getting triggered even if the user was the only Pokémon alive in the party.
 2021-06-07 22:39:53 -03:00
ultima-soul
0a87adad1a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 18:05:52 -07: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
ExpoSeed
6f25c47d6b
Merge pull request #1528 from ultima-soul/num_species_back_animation_fix 
Add back NUM_SPECIES to sSpeciesToBackAnimSet definition.
 2021-06-07 17:16:10 -05:00
ultima-soul
11a8517320 Add back NUM_SPECIES to sSpeciesToBackAnimSet definition. 2021-06-07 15:04:41 -07:00
ExpoSeed
0ad01bce50
Merge pull request #1527 from ultima-soul/item_expansion_sync 
Item Expansion Upstream Sync
 2021-06-07 15:56:48 -05:00
ExpoSeed
e7c19f3d9b
Merge pull request #1526 from ultima-soul/pokemon_expansion_sync 
Pokemon Expansion Upstream Sync
 2021-06-07 15:56:45 -05:00
ExpoSeed
339f297949
Merge pull request #1525 from ultima-soul/battle_engine_sync 
Battle Engine Upstream Sync
 2021-06-07 15:56:43 -05:00
ultima-soul
d30ab7760f Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-06-07 13:52:08 -07:00
ultima-soul
cf19635a80 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-06-07 13:15:46 -07:00
ultima-soul
092f02f119 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-06-07 12:00:23 -07:00
MissingNoL
caf2548830 Included battle_util.h, fixed parameter IsMoveMakingContact 2021-06-06 21:40:38 -07:00
MissingNoL
bfc66a21cc gBattlescriptCurrInstr[3] is not reading species parameter 2021-06-06 19:14:11 -07:00
ultima-soul
2563bc5c83
Merge pull request #1521 from DizzyEggg/largeexp 
Allow larger exp gains
 2021-06-06 13:33:33 -07:00