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 |
|
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
|
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 |
|
Jaizu
|
3ae783aa16
|
Change the ability popup sound
|
2021-06-06 22:19:17 +02:00 |
|
MissingNoL
|
f0934ea272
|
Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into Photon_Geyser
|
2021-06-05 17:41:43 -07:00 |
|
MissingNoL
|
c876de5a5b
|
Done! Merge branch 'battle_engine' into Photon_Geyser
|
2021-06-05 17:40:06 -07: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
|
921b80de7c
|
Update battle_script_commands.h
Properly aligned the list of number IDs
|
2021-06-05 16:40:03 -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 |
|