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

12991 Commits

Author SHA1 Message Date
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
TheXaman
1463b857c3 Small change how hidden abilities are accessed in PE 2021-06-09 23:10:25 +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
Ariel Antonitis
385c94d068 Merge branch 'romhack' into lighting 2021-06-08 17:58:29 -04: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
ghoulslash
1b3f53bae8 Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs 2021-06-08 13:31:36 -06: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
e2f14d43db Fix Gravity's animation 2021-06-08 12:13:40 +02: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
ultima-soul
11a8517320 Add back NUM_SPECIES to sSpeciesToBackAnimSet definition. 2021-06-07 15:04:41 -07: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
Jaizu
3ae783aa16
Change the ability popup sound 2021-06-06 22:19:17 +02:00
MissingNoL
9cd522d254
Merge branch 'battle_engine' into Photon_Geyser 2021-06-05 16:46:28 -07:00
MissingNoL
d69cfcff70
Update battle_script_commands.c 
Included src/battle_util.c to call IsMoveMakingContact
 2021-06-05 16:43:19 -07:00
MissingNoL
517763bc9f
Update src/battle_util.c 
Changed an `if` to `else if`

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-06-05 16:38:37 -07:00
MissingNoL
e48e9c1d7a Merge branch 'battle_engine' into Hyperspace_Fury 2021-06-05 14:42:30 -07:00
MissingNoL
c4b700a8e7 Only thing left is making IsMoveMakingContact work when hitting King's Shield, etc. 2021-06-05 13:47:05 -07:00
Ariel Antonitis
e4b9bb75e2 Merge branch 'master' into romhack 2021-06-04 23:36:21 -04:00
Ariel Antonitis
37f0684d98 Unown followers now appear as the right letter. 2021-06-04 23:35:10 -04:00
Ariel Antonitis
c267dd6ee6 Added function to check for newer emulators/hardware. 2021-06-04 23:35:04 -04:00
Ariel Antonitis
e9d01b4808 Added a non-RNG, PID-preserving way to modify pokemon nature. 
(wip) Preserve shiny value when changing nature.

(WIP) Preserve shiny value.

(WIP) Preserve nature.

(WIP) Removed some debugging statements.

(WIP) Removed more debugging statements.

(WIP) Nature changing now supports Unown.
 2021-06-04 22:49:20 -04:00
ultima-soul
3448e19275
Merge pull request #1459 from ExpoSeed/BE/rename-flags 
Rename flags
 2021-06-04 19:33:45 -07:00
AJ Fontaine
2fe7184d10
Rename sText_WildPkmnAppeared2 to reflect its use 
sText_WildPkmnAppeared2 is used for Legendary battles, so sText_LegendaryPkmnAppeared would be more informative.
 2021-06-04 22:32:33 -04:00
ExpoSeed
12a155bd9a FLAG_DMG_2X_IN_AIR can now hit targets 2021-06-04 21:28:28 -05:00
ExpoSeed
aefd5e26d1
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-06-04 21:26:15 -05:00
ExpoSeed
8810809849 Missed one rename! 2021-06-04 19:39:03 -05:00
ExpoSeed
ec2c140ecb Disambiguate Thousand Arrows flag from other flags 2021-06-04 19:34:37 -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
LOuroboros
b552db7193 Tweaked the Oblivious immunities 
Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.
 2021-06-04 19:23:07 -03:00
DizzyEggg
4b744374c8 Allow larger exp gains 2021-06-03 23:17:44 +02:00
ultima-soul
2813b4f9bf
Merge pull request #1519 from DizzyEggg/flameburst 
Fix FlameBurst
 2021-06-03 09:30:50 -07:00