BuffelSaft
|
2a6b989c92
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into body-press
|
2021-06-02 12:41:28 +12:00 |
|
ExpoSeed
|
22478b857b
|
Add {FORM_CHANGE_END} to Silvally and Genesect
|
2021-05-28 19:24:44 -05:00 |
|
MissingNoL
|
0f09055cfe
|
Fixes and added Poison chance to Shell Side Arm (needs contact on physical)
|
2021-05-28 11:11:03 -07:00 |
|
MandL27
|
2d92f23240
|
Merge pull request #1514 from pineapplemachine/pokemon_expansion_evo_fix
Fixes to pokemon_expansion species evolution data: Galarian Ponyta, Tranquill, and Kubfu
|
2021-05-28 11:31:25 -04:00 |
|
Sophie Kirschner
|
1a4c6d3490
|
Fixes to species evolution data
|
2021-05-28 18:16:52 +03:00 |
|
MissingNoL
|
f30a9542ee
|
Problem: Photon Geyser is calculating as Shell Side Arm?? Needs: Poison effect, contact move for Shell Side Arm
|
2021-05-27 22:21:55 -07:00 |
|
amiosi
|
7b530a34bf
|
finish requested changes
|
2021-05-27 20:14:46 -04:00 |
|
amiosi
|
03a7020512
|
double oops
|
2021-05-27 16:16:12 -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 |
|
ultima-soul
|
eedd374a5f
|
Merge pull request #1420 from Blackforest92/pokemon_expansion
Added missing gen8 battle sprites and available icons and various fixes
|
2021-05-24 21:13:12 -07:00 |
|
Blackforest92
|
d74492b591
|
Returning Alcremie back to monkey
|
2021-05-25 10:57:06 +07:00 |
|
Blackforest92
|
2dccce7675
|
Erased Eternamax comment in src/data/pokemon_graphics/enemy_mon_elevation.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-05-25 09:17:50 +07:00 |
|
ultima-soul
|
1f859e340d
|
Merge pull request #1415 from ghoulslash/item_expansion
Add Berry Hold Effects
|
2021-05-24 11:07:35 -07:00 |
|
ghoulslash
|
c356ffaed4
|
merge with be. fix null ptr check in GetBattleMoveSplit
|
2021-05-24 10:46:53 -06:00 |
|
ghoulslash
|
64815a5f85
|
Update src/data/items.h
Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
|
2021-05-24 10:18:05 -06:00 |
|
ghoulslash
|
5aa1b5b1ee
|
Update src/data/items.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-05-24 10:17:59 -06:00 |
|
ghoulslash
|
39974b05f7
|
Update src/data/items.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-05-24 10:17:55 -06:00 |
|
ghoulslash
|
a3b092c9a3
|
Update src/data/items.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-05-24 10:17:51 -06:00 |
|
ghoulslash
|
6b868a028a
|
Update src/data/items.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-05-24 10:17:47 -06:00 |
|
ghoulslash
|
aafc8e2109
|
Update src/data/items.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-05-24 10:17:39 -06:00 |
|
ghoulslash
|
f7c00d2366
|
Update src/data/items.h
Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
|
2021-05-24 10:17:34 -06:00 |
|
MissingNoL
|
031504cd12
|
Spaces instead of tabs
|
2021-05-23 18:31:49 -07:00 |
|
MissingNoL
|
07a9674d22
|
Fixed
|
2021-05-23 18:30:22 -07:00 |
|
MissingNoL
|
c428d1bdbb
|
Coded Hyperspace Fury
|
2021-05-23 17:59:14 -07:00 |
|
ghoulslash
|
c3e28e9b1a
|
merge with be
|
2021-05-23 12:22:52 -06:00 |
|
MissingNoL
|
dd9920e80b
|
Update move_descriptions.h
|
2021-05-23 02:41:41 -07:00 |
|
MissingNoL
|
8b6906bf32
|
Update abilities.h
|
2021-05-23 02:39:57 -07:00 |
|
LOuroboros
|
5ef106f061
|
Made gAbilityNames and gAbilityDescriptionPointers read from ABILITIES_COUNT
|
2021-05-22 10:29:57 -03:00 |
|
Eduardo Quezada D'Ottone
|
5fd4c35483
|
Merge pull request #1412 from amiosi/noFlip
restore and add noFlip values
|
2021-05-21 11:44:11 -04:00 |
|
Eduardo Quezada D'Ottone
|
ff296efb5c
|
Merge pull request #1484 from LOuroboros/patch-1
Corrected the item descriptions of some berries
|
2021-05-21 11:41:14 -04:00 |
|
Eduardo Quezada D'Ottone
|
04c6331a60
|
Merge pull request #1432 from BuffelSaft/thousand_arrows
Fix Thousand Arrows
|
2021-05-21 11:40:13 -04:00 |
|
LOuroboros
|
41bc603110
|
Wings -> Feathers
|
2021-05-17 22:06:31 -03:00 |
|
LOuroboros
|
0bc8ed59f5
|
Wings -> Feathers
|
2021-05-17 21:58:17 -03:00 |
|
LOuroboros
|
972ed0d5a7
|
Adjusted the item data of the Wings/Feathers
Now they work. Yay.
|
2021-05-17 21:34:42 -03:00 |
|
ultima-soul
|
50c2514267
|
Merge pull request #1469 from ultima-soul/pokemon_expansion_sync
Pokemon Expansion Upstream Sync
|
2021-05-13 20:56:29 -07:00 |
|
ultima-soul
|
88861abb29
|
Merge pull request #1470 from ultima-soul/item_expansion_sync
Item Expansion Upstream Sync
|
2021-05-13 20:56:23 -07:00 |
|
LOuroboros
|
95d41524a2
|
Implemented Clanging Scales' effect
|
2021-05-09 18:20:03 -03:00 |
|
LOuroboros
|
16573a36eb
|
Update item_descriptions.h
|
2021-05-08 18:32:37 -03: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
|
1ccf43b5f7
|
Merge pull request #1451 from LOuroboros/stench
Implemented Stench's battle effect
|
2021-05-04 09:41:13 -06:00 |
|
ghoulslash
|
97ae2fe1be
|
Merge pull request #1460 from AmbientDinosaur/patch-2
Corrected the move data for Gen 4 Overheat
|
2021-05-04 09:36:36 -06:00 |
|
ghoulslash
|
6703517f6d
|
Merge pull request #1456 from ExpoSeed/IE/razor-claw
Razor claw effect
|
2021-05-04 09:33:40 -06:00 |
|
ultima-soul
|
cf0fd961b9
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-04-28 23:56:58 -07:00 |
|
ultima-soul
|
00c3f060b1
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2021-04-28 23:53:23 -07:00 |
|
ultima-soul
|
56fc420187
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-04-28 21:34:30 -07:00 |
|
ultima-soul
|
75a9fdbafa
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2021-04-28 20:50:59 -07:00 |
|
ultima-soul
|
0da3f74a7e
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-04-28 18:58:38 -07:00 |
|
GriffinR
|
6c38837b26
|
Merge pull request #1420 from GriffinRichards/doc-dataanims
Document battler affine anims, default pokeball throw
|
2021-04-28 13:56:42 -04:00 |
|
ultima-soul
|
14a0303e2f
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-04-27 18:36:37 -07:00 |
|