ghoulslash
|
416c517e49
|
Merge pull request #1786 from Xavion3/damage_debug
Adds simulated damage to the debug menu
|
2021-10-19 12:14:38 -04:00 |
|
ghoulslash
|
fa8fa32259
|
Update src/battle_main.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2021-10-19 11:52:50 -04:00 |
|
ghoulslash
|
ebc86bb247
|
update baton pass status3 bits
|
2021-10-19 09:38:27 -04:00 |
|
LOuroboros
|
a6315ffc75
|
Implemented Plasma Fists
|
2021-10-19 09:50:18 -03:00 |
|
Blackforest92
|
4e9af083db
|
forgot to adjust front pic coordinate, only remember meowstic though
|
2021-10-19 19:47:37 +07:00 |
|
ghoulslash
|
eda99fcf29
|
Merge pull request #1742 from AsparagusEduardo/be_gStatuses4
Add gStatutes4
|
2021-10-19 08:45:47 -04:00 |
|
ghoulslash
|
305a12161c
|
Merge pull request #1771 from BuffelSaft/mulit_target
Fix multi target moves
|
2021-10-19 08:43:46 -04:00 |
|
Blackforest92
|
626aa4e754
|
Fixes stray pixel on magnemite backsprite
|
2021-10-19 19:27:01 +07:00 |
|
Blackforest92
|
86d4658bd3
|
Added anim_front.png to gen6 pokemons + fix to magnemite
|
2021-10-19 19:20:12 +07:00 |
|
GriffinR
|
934a7e7a5d
|
Merge pull request #1516 from GriffinRichards/doc-miscbattle
Miscellaneous battle documentation
|
2021-10-19 08:09:17 -04:00 |
|
Xavion3
|
6a16813ce8
|
Rename menu option to be more appropriate to changed info
|
2021-10-19 23:01:07 +11:00 |
|
Xavion3
|
4673ff30e4
|
Allow the AI to see damage against it's partner
|
2021-10-19 23:00:40 +11:00 |
|
Xavion3
|
055c1c47b7
|
Fix double battles damage scoring
|
2021-10-19 23:00:04 +11:00 |
|
Xavion3
|
150dd7c633
|
Add damage information to the debug menus
|
2021-10-19 22:39:07 +11:00 |
|
LOuroboros
|
da70accc3e
|
Oopsie
|
2021-10-19 08:02:36 -03:00 |
|
LOuroboros
|
d9b8e11a9c
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE
|
2021-10-19 07:47:42 -03:00 |
|
LOuroboros
|
2dea4f6782
|
Forgot to port over a return for jumpifcantreverttoprimal
|
2021-10-19 07:23:02 -03:00 |
|
BuffelSaft
|
a374bbf9f3
|
Merge pull request #1785 from SonikkuA-DatH/SonikkuA-DatH-patch-1
For Magnemite sprite errors
|
2021-10-19 18:08:42 +13:00 |
|
SonikkuA-DatH
|
dff6555287
|
Magnemite
made highlights white
|
2021-10-18 21:01:29 -07:00 |
|
BuffelSaft
|
b2969b6782
|
Merge pull request #1699 from AsparagusEduardo/PE_ArceusAnimations
Updated Arceus' forms' animations
|
2021-10-19 16:35:03 +13:00 |
|
BuffelSaft
|
910fdfa94a
|
Revert "Fix multi target moves"
This reverts commit b5293cc3e2.
|
2021-10-19 16:25:01 +13:00 |
|
SonikkuA-DatH
|
c84811ac20
|
Magnemite back
Retweak. Shiny broke things for base, so went to source
|
2021-10-18 18:02:22 -07:00 |
|
Eduardo Quezada D'Ottone
|
3c6101d957
|
Clear gStatuses4 data
|
2021-10-18 21:55:16 -03:00 |
|
SonikkuA-DatH
|
377e46e2ec
|
For Magnemite sprite errors
Fixing Magnemite eye to use whites
Also fix back pixel
|
2021-10-18 17:49:08 -07:00 |
|
GriffinR
|
24b4e898ad
|
More mauville_old_man clean up
|
2021-10-18 14:40:04 -04:00 |
|
GriffinR
|
b31bddddca
|
Clean up metatile_behavior
|
2021-10-18 12:54:29 -04:00 |
|
ghoulslash
|
91e6c8fb0e
|
Merge pull request #1784 from LOuroboros/gravAppleAI
Small AI improvement related to Grav Apple
|
2021-10-18 09:18:25 -04:00 |
|
LOuroboros
|
25255475a7
|
AI will now take Grav Apple's new effect in consideration
|
2021-10-18 10:05:19 -03:00 |
|
GriffinR
|
7590bacec1
|
Label remaining symbols in field_specials
|
2021-10-18 02:14:29 -04:00 |
|
GriffinR
|
46dd10c87b
|
Clean up trainer_pokemon_sprites
|
2021-10-18 01:56:24 -04:00 |
|
GriffinR
|
db8ce5d7f9
|
Clean up mauville_old_man, drop ScrSpecial prefix
|
2021-10-18 01:09:41 -04:00 |
|
ghoulslash
|
8dc77e6fe3
|
Merge pull request #1782 from LOuroboros/glare
Updated Glare
|
2021-10-17 22:11:33 -04:00 |
|
ghoulslash
|
ba741421d9
|
Merge pull request #1777 from AsparagusEduardo/fix_pyroarF
Fixed Female Pyroar's sprite position
|
2021-10-17 22:04:09 -04:00 |
|
GriffinR
|
ed6fdd743f
|
Some pokemon_icon clean up
|
2021-10-17 22:04:08 -04:00 |
|
GriffinR
|
a950f9c771
|
Clean up international_string_util
|
2021-10-17 21:51:11 -04:00 |
|
GriffinR
|
f2e0c9ec9d
|
Some pokedex clean up
|
2021-10-17 21:32:09 -04:00 |
|
Eduardo Quezada D'Ottone
|
3cdf736eb8
|
Merge branch 'PokemonExpansion' into fix_pyroarF
# Conflicts:
# graphics/pokemon/pyroar/backf.png
|
2021-10-17 19:38:20 -03:00 |
|
GriffinR
|
371a13e9f9
|
Clean up in save_location
|
2021-10-17 17:38:52 -04:00 |
|
Eduardo Quezada D'Ottone
|
e3252a68cd
|
Merge pull request #1545 from MissingNoL/PLG
Implemented PLG move effects
|
2021-10-17 18:30:50 -03:00 |
|
GriffinR
|
c70ec9748a
|
Some union_room_chat clean up
|
2021-10-17 17:27:32 -04:00 |
|
Eduardo Quezada D'Ottone
|
ead5c92469
|
Merge branch 'battle_engine' into PLG
|
2021-10-17 17:38:54 -03:00 |
|
GriffinR
|
164590e37d
|
Merge pull request #1512 from GriffinRichards/minor-constants
Add some misc constants/usage
|
2021-10-17 11:32:30 -04:00 |
|
LOuroboros
|
e7ad7319e3
|
Updated Glare
|
2021-10-17 12:03:35 -03:00 |
|
LOuroboros
|
dcea8e45ed
|
Fixed jumpifspecies
|
2021-10-17 10:51:55 -03:00 |
|
Eduardo Quezada D'Ottone
|
aa344aa0a2
|
Merge pull request #1781 from LOuroboros/dynaCannon
Set the right .effect to Dynamax Cannon
|
2021-10-17 10:17:18 -03:00 |
|
LOuroboros
|
5d0350cdbc
|
Set the right .effect to Dynamax Cannon
|
2021-10-17 10:08:30 -03:00 |
|
Eduardo Quezada D'Ottone
|
df817fb2ab
|
Merge pull request #1772 from LOuroboros/gravApple
Added Grav Apple's power boost
|
2021-10-17 09:51:29 -03:00 |
|
LOuroboros
|
d6304099ac
|
Review optimization
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2021-10-17 09:42:31 -03:00 |
|
LOuroboros
|
59cfbe55c1
|
Gave Grav Apple a move effect of its own
|
2021-10-17 09:27:35 -03:00 |
|
BuffelSaft
|
0b7072e007
|
Merge pull request #1780 from rh-hideout/revert-1666-bKGD_PE
Revert "Fix the 'bKGD: invalid index' error"
|
2021-10-17 23:49:26 +13:00 |
|