atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11085 commits 2 branches 40 tags 600 MiB
Commit graph

1489 commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
10306d046c Fixed Steam Roller's define 2021-11-01 22:07:54 -03:00
Eduardo Quezada D'Ottone
8332bfae46 Gen 8 combo moves 2021-11-01 21:59:34 -03:00
Eduardo Quezada D'Ottone
c4aa2a1e92 Added Gen 8 contest data (minus combos), also fixed Bubble's category 2021-11-01 21:36:08 -03:00
Eduardo Quezada D'Ottone
f3013d8ee9 Standarized Solarbeam into Solar Beam 2021-11-01 18:36:35 -03:00
GriffinR
54a70ca4d4
Merge pull request #1530 from GriffinRichards/doc-graphics 
Label remaining symbols in graphics.c
 2021-11-01 17:00:06 -04:00
Eduardo Quezada D'Ottone
d4638eaf1a Fixed Plasma Fists target 2021-10-31 19:50:31 -03:00
cbt6
9a1764f83e Label some animation index numbers 2021-10-30 01:37:49 +08:00
LOuroboros
a77f058146 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser 2021-10-28 14:24:43 -03:00
ghoulslash
34e966fdee
Merge pull request #1815 from LOuroboros/hyperspaceFury 
Implemented Hyperspace Fury
 2021-10-28 13:20:33 -04:00
LOuroboros
82101d3581 Optimizations 2021-10-28 14:02:43 -03:00
LOuroboros
2803b840e5
Updated Shadow Force's move data 2021-10-28 13:52:35 -03:00
GriffinR
41ecae91f8 Label remaining symbols in graphics.c 2021-10-27 13:47:18 -04:00
LOuroboros
ad95fa3d15 Updated Shell Side Arm's description 2021-10-27 11:14:12 -03:00
LOuroboros
fc7f1acf20 Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser 2021-10-27 11:13:59 -03:00
LOuroboros
1ab8c84f41 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury 2021-10-26 21:23:21 -03:00
BuffelSaft
adcf563ba1 Add missing berry data 
Certain gen 4+ berries were missing graphics and berry data. Adding this data allows them to be viewed and planted.
 2021-10-26 14:42:06 +13:00
GriffinR
7f3c529935 Document record mixing mail swap 2021-10-24 15:49:19 -04:00
Eduardo Quezada D'Ottone
d95351dd97 Merge branch 'BattleEngine' into BE_config 
# Conflicts:
#	include/constants/battle_config.h
 2021-10-23 19:46:33 -03:00
LOuroboros
d31700d2ac Replaced the Red and Blue Orbs' sprites 2021-10-23 13:49:02 -03:00
Eduardo Quezada D'Ottone
e80a266578
Merge pull request #1741 from LOuroboros/primalReversionPE 
Primal Reversion related tweaks for the PE
 2021-10-22 22:28:43 -03:00
Eduardo Quezada D'Ottone
d769920a15
Merge pull request #1740 from LOuroboros/primalReversionIE 
Primal Reversion related tweaks for the IE
 2021-10-22 22:28:15 -03:00
Blackforest92
81011fffc3 allow builder to use anim_front of female pyroar, adjust herdier back position 2021-10-22 09:58:21 +07: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
Blackforest92
86d4658bd3 Added anim_front.png to gen6 pokemons + fix to magnemite 2021-10-19 19:20:12 +07:00
Eduardo Quezada D'Ottone
ead5c92469
Merge branch 'battle_engine' into PLG 2021-10-17 17:38:54 -03:00
LOuroboros
5d0350cdbc Set the right .effect to Dynamax Cannon 2021-10-17 10:08:30 -03:00
LOuroboros
59cfbe55c1 Gave Grav Apple a move effect of its own 2021-10-17 09:27:35 -03:00
GriffinR
e1900efe1e
Merge branch 'master' into doc-miscbattle 2021-10-15 22:46:43 -04:00
GriffinR
a4a3c1c9e5
Merge pull request #1511 from GriffinRichards/doc-union 
Document link_rfu / Union Room
 2021-10-15 22:44:01 -04:00
Eduardo Quezada D'Ottone
b9816f0f28 Saftety Goggles typo for Item Expansion 2021-10-14 20:38:13 -03:00
Eduardo Quezada D'Ottone
21837b659a
Merge branch 'battle_engine' into bug_bite 2021-10-14 19:46:50 -03:00
Eduardo Quezada D'Ottone
d689842689
Merge pull request #1657 from ghoulslash/rototiller 
Rototiller Fix + MOVE_TARGET_ALL_BATTLERS
 2021-10-13 22:45:50 -03:00
ghoulslash
a3d2bdc9cf merge with be 2021-10-13 18:30:53 -04:00
GriffinR
f23e0beeba Rename battle anim cmds, move its data, name remaining symbols 2021-10-11 13:18:21 -04:00
Eduardo Quezada D'Ottone
c3f8b77d82 Setting for pre-Gen6 Hidden Power Damage. 2021-10-10 20:26:38 -03:00
Eduardo Quezada D'Ottone
4572e62669 Gen 5 Scald effect 2021-10-09 23:56:07 -03:00
LOuroboros
34533a9047 Adjusted the data of the Red and Blue Orbs 2021-10-09 00:53:35 -03:00
LOuroboros
b7fd767e8c Added primal reversions to gEvolutionTable 2021-10-09 00:21:47 -03:00
GriffinR
31b501e7eb Start misc battle documentation 2021-10-08 16:39:46 -04:00
GriffinR
a2655ba9ab
Merge branch 'master' into doc-union 2021-10-07 16:10:35 -04:00
GriffinR
6aaf50ee27 Rename GF Gname, Rfu, finish bulk of Union Room, more link doc 2021-10-07 10:43:03 -04:00
ghoulslash
4aeadd96c9 merge with be 2021-10-06 14:49:23 -04:00
ghoulslash
11f4f0f08e update move data to those that target all battlers 2021-10-06 14:41:48 -04:00
ghoulslash
391cfabcac merge with be 2021-10-06 14:31:21 -04:00
ghoulslash
1f4844c7f5
Merge pull request #1710 from AsparagusEduardo/BE_Struggle 
Implemented modern effect of struggle with config
 2021-10-06 09:27:10 -04:00
ghoulslash
2a45d9041c
Merge pull request #1716 from AsparagusEduardo/fix_Howl 
Updated sound flags for Howl and Heal Bell
 2021-10-06 09:25:57 -04:00
ultima-soul
06f36595d6 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp 2021-10-05 19:25:52 -07:00
Eduardo Quezada D'Ottone
2b54b48b04 Merge branch 'PokemonExpansion' into PE_FormChangeHoldItems 
# Conflicts:
#	src/pokemon.c
 2021-10-05 21:13:36 -03:00
ExpoSeed
2e9eb0e490
Merge pull request #1718 from ultima-soul/form_change_item_data 
Assign FORM_ITEM_USE Constants
 2021-10-05 15:37:53 -05:00
Eduardo Quezada D'Ottone
43d42c95cf Terrain Pulse effect implemented 2021-10-04 22:45:37 -03:00
Eduardo Quezada D'Ottone
92f0f6f820 Fixed Psychic Fangs power 2021-10-04 20:20:00 -03:00
ultima-soul
7f5204a09f
Merge pull request #1691 from AsparagusEduardo/item_sitrus 
Sitrus Berry Gen4+ heal. Credit to SBird1337
 2021-10-04 15:18:12 -07:00
Eduardo Quezada D'Ottone
fd9b2eddbe
Update src/data/items.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-10-04 19:05:47 -03:00
ultima-soul
78d2215196 Improve and refactor some form change code. Separated out ability checks into their own methods. Change FORM_ITEM_USE_TIME to specify time of day instead of hardcoding. 2021-10-03 10:16:09 -07:00
ultima-soul
50ab03e9c1 Assign FORM_ITEM_USE constants to secondaryId for appropriate items. 2021-10-03 09:39:26 -07:00
GriffinR
6e62c057f5 Document remaining symbols in pokemon.c 2021-10-02 23:48:12 -04:00
Eduardo Quezada D'Ottone
76bdbf164e Updated sound flags for Howl and Heal Bell 2021-10-02 20:00:00 -03:00
Eduardo Quezada D'Ottone
57ea20bc6d Implemented modern effect of struggle with config 2021-10-02 13:32:36 -03:00
Eduardo Quezada D'Ottone
fdd284b50b Hold Item party menu 2021-09-29 02:06:03 -03:00
Eduardo Quezada D'Ottone
c3087de712 Fixed Coba Berry's typing 2021-09-28 22:13:39 -03:00
ultima-soul
de35894669 Enable Mental Herb description toggling based on B_MENTAL_HERB config. 2021-09-27 14:26:07 -07:00
Eduardo Quezada D'Ottone
ff24b15241 derp 2021-09-27 00:00:24 -03:00
Eduardo Quezada D'Ottone
91feaecb04 Hold effect update 2021-09-26 23:45:39 -03:00
ghoulslash
761006a164 merge with be 2021-09-26 19:19:32 -04:00
Eduardo Quezada D'Ottone
4fbe4da7d0 Sitrus Berry Gen4+ heal. Credit to SBird1337 2021-09-26 18:46:34 -03:00
LOuroboros
234f3290c3 Added a day time exclusive equivalent to FORM_USE_ITEM 
Primarily for Shaymin, since it can only change its form with the Gracidea during the day.
Special thanks to AsparagusEduardo.
 2021-09-25 22:00:10 -03:00
LOuroboros
a49676ab55 Set the right holdEffectParam to the terrain seeds 2021-09-25 21:09:38 -03:00
LOuroboros
813d114132 Synced include/constants/hold_effects.h with the BE 2021-09-25 20:58:07 -03:00
GriffinR
42d2fefe02
Merge branch 'master' into tag-none 2021-09-24 10:17:34 -04:00
Syreldar
4c05520bf3 Fixed Retaliate's naming. 2021-09-24 16:02:26 +02:00
GriffinR
a6ab2eb883
Merge branch 'master' into trailingSpaces 2021-09-23 21:39:21 -04:00
Eduardo Quezada D'Ottone
3ef87ec722
Merge pull request #1416 from ExpoSeed/IE/item-use-form-change 
Support form changes with PE
 2021-09-22 00:05:11 -03:00
Eduardo Quezada D'Ottone
f9d1375451
Merge pull request #1375 from ExpoSeed/PE/form-change-table 
Form change table
 2021-09-22 00:04:26 -03:00
LOuroboros
afc55994a9 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into gen5_2nd_frames 2021-09-21 20:45:17 -03:00
Eduardo Quezada D'Ottone
08d3c31abe
Merge pull request #1584 from Blackforest92/pokemon_expansion 
Port missing Gen8 icons from DPE
 2021-09-20 22:48:57 -03:00
ghoulslash
136fbb5862 fix swapped descs 2021-09-20 21:33:50 -04:00
ghoulslash
0ea6c65b83 merge with be 2021-09-17 09:10:09 -04:00
ghoulslash
9d8672e3df merge with be 2021-09-16 13:12:59 -04:00
ghoulslash
aac7ae3595 add MOVE_TARGET_ALL_BATTLERS 2021-09-16 10:45:33 -04:00
ghoulslash
b85586a33a merge with be 2021-09-15 12:54:39 -04:00
GriffinR
f8f7617946 Add TAG_NONE 2021-09-14 13:14:14 -04:00
BuffelSaft
db928a1329 Data entry for new sprites 
Add sprite defines, entries to gender tables, etc.
 2021-09-11 14:12:41 +12:00
GriffinR
cbf8863e5b Clean up Lilycove Lady 2021-09-09 15:24:34 -04:00
BuffelSaft
a4b630e6b5 Fix MOVE_EFFECT_REMOVE_STATUS 
Wake-Up Slap and Sparkling Aria now print the correct message when the target is cured.

Also, fix Ice Hammer's effect chance.
 2021-09-07 16:34:32 +12:00
DizzyEggg
b0a1153a2b
Merge pull request #1600 from LOuroboros/gen6_footprints 
Added footprints for Gen. 6 species
 2021-09-06 10:36:46 +02:00
DizzyEggg
67fd379771
Merge pull request #1632 from BuffelSaft/hammer-arm 
Fix Hammer arm's effect chance
 2021-09-06 10:16:47 +02:00
BuffelSaft
4c8a12006c Fix Hammer Arm's effect chance 2021-09-06 19:45:30 +12:00
ghoulslash
3066e09e68 decap pokemon in mental herb 2021-09-04 08:43:33 -04:00
ghoulslash
f682e409f0 update mental herb desc 2021-09-04 08:19:57 -04:00
ghoulslash
e475813799 revert mental herb desc 2021-09-04 08:18:38 -04:00
ghoulslash
933696b3cd merge with be 2021-09-03 17:41:00 -04:00
BuffelSaft
7d251c39f7 Correct Liquidation and Sparkling Aria 
Liquidation is affected by Sheer Force, Sparkling Aria should hit both foes and ally.
 2021-09-02 16:05:36 +12:00
ExpoSeed
0f99d9d4c6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-08-30 13:26:40 -05:00
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files 
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
 2021-08-24 19:59:32 -03:00
LOuroboros
87461db04d Added missing 2nd frames for Gen. 5 species 
Also made certain Pokémon such as Zebstrika or Galvantula use their 2nd frame.
 2021-08-23 08:28:58 -03:00
LOuroboros
5c1d7e52dc Added footprints for Gen. 6 species 2021-08-23 06:28:10 -03:00
LOuroboros
a0a888698e Corrected Bronzor's evo level 2021-08-22 23:19:26 -03:00
ultima-soul
4c3ed52c2f Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-08-17 11:39:11 -07:00
ultima-soul
988320b89a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-08-17 11:25:13 -07:00
ultima-soul
76a7a2720d Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-08-16 16:10:59 -07:00
ultima-soul
b620349da0 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-16 15:43:27 -07:00
GriffinR
e01ae55c13 Start more link_rfu_2 documentation 2021-08-15 15:13:42 -04:00
GriffinR
28a8fe191a Document item menu 2021-08-10 22:13:02 -04:00
Blackforest92
3bd81d347d Add missing Gen8 icons 2021-07-31 14:48:55 +07:00
ghoulslash
ab529b4e89 add stuff cheeks 2021-07-27 10:31:48 -06:00
ghoulslash
c914ed8572 fix sucker punch, surging strikes, obstruct, and snipe shot 2021-07-25 09:38:54 -06:00
ghoulslash
a37d4c3da9 merge with be, give life dew jungle healing effect 2021-07-25 08:22:05 -06:00
LOuroboros
e55fe62d59 Assigned dummy anims to the front sprite of each Pikachu and Pichu special form 2021-07-15 13:42:51 -03:00
ultima-soul
ad8cfda831 Add and rearrange Key Items. 2021-07-06 17:03:46 -07:00
ultima-soul
2d8d38f44c Add TM51 through TM100. 2021-07-05 18:11:57 -07:00
ultima-soul
53e900a643 Rearranged rest of item ids except for Key Items. 2021-07-02 22:43:50 -07:00
ultima-soul
9e0b866f09 Rearranged Poke Ball item ids. 2021-06-18 21:46:20 -07:00
BuffelSaft
06111bdc63 Replace EFFECT_THAW_HIT 
Both moves that used EFFECT_THAW_HIT now use EFFECT_BURN_HIT.
 2021-06-19 11:43:29 +12:00
Xhyzi
c2bd046ea6 Shell Trap 2021-06-15 20:22:50 +02:00
Xhyzi
155e9b6332 Court Change 2021-06-15 20:14:10 +02:00
Xhyzi
271f19e6cb Terrain Pulse 2021-06-15 20:01:57 +02:00
Xhyzi
0202b75822 Beak Blast 2021-06-15 19:57:21 +02:00
Xhyzi
7799e49e3a Corrosive Gas 2021-06-15 19:45:24 +02:00
Xhyzi
e7ec4df70b Rising Voltage 2021-06-15 17:51:59 +02:00
Xhyzi
ee3f3eb78f Meteor Beam 2021-06-15 17:06:21 +02:00
Xhyzi
62525516a4 Scale Shot 2021-06-15 16:50:19 +02:00
Xhyzi
60ce39543e Expanding Force 2021-06-15 16:29:06 +02:00
Xhyzi
5a094a3033 Snap Trap 2021-06-15 16:22:42 +02: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
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
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
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
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
MissingNoL
bfc66a21cc gBattlescriptCurrInstr[3] is not reading species parameter 2021-06-06 19:14:11 -07:00
MissingNoL
c876de5a5b Done! Merge branch 'battle_engine' into Photon_Geyser 2021-06-05 17:40:06 -07:00
MissingNoL
e48e9c1d7a Merge branch 'battle_engine' into Hyperspace_Fury 2021-06-05 14:42:30 -07: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
e5a3123b8c
Merge pull request #1505 from MissingNoL/Decaps-and-Miracle-Eye-Text-Fixes 
Decaps and Miracle Eye text fixes
 2021-06-03 09:06:15 -07:00
Jaizu
a500b04a51
Feathr > Feather 
We do have enough space to put the whole word.
 2021-06-03 12:08:31 +02:00
MissingNoL
1022d34218
Update src/data/text/move_descriptions.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-06-03 01:16:03 -07:00
LOuroboros
b215b44951 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into clanging_scales 2021-06-03 05:09:14 -03:00
ultima-soul
bb9a7b04f8
Merge pull request #1499 from LOuroboros/patch-1 
Made gAbilityNames and gAbilityDescriptionPointers read from ABILITIES_COUNT
 2021-06-02 23:07:50 -07:00
ultima-soul
45fb16c40a
Merge pull request #1494 from LOuroboros/feathers_PE 
Corrected the Wings/Feathers #2
 2021-06-02 22:56:39 -07:00
ultima-soul
fc19023087
Merge pull request #1493 from LOuroboros/feathers 
Corrected the Wings/Feathers
 2021-06-02 22:56:16 -07:00
LOuroboros
586c76d93a Changed Clanging Scales' secondaryEffectChance to 0 
Review request.
 2021-06-02 16:46:28 -03:00
LOuroboros
1b13db80fc
Syntax fix 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-06-02 16:43:01 -03:00
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
GriffinR
18f85b5cf0
Merge pull request #1415 from GriffinRichards/doc-contestutil 
Some Contest clean up
 2021-04-27 02:29:41 -04:00
GriffinR
c0aedf8df4
Merge pull request #1410 from GriffinRichards/doc-tradedata 
Document trade sequence animation, some trade cleanup
 2021-04-26 13:26:12 -04:00
GriffinR
e40f89b175 Move unknown data table, reference with species 2021-04-25 02:19:01 -04:00
GriffinR
bc9fc38254 Misc contest cleanup 2021-04-22 15:51:04 -04:00
GriffinR
dbe24f0baa Clean up contest_painting 2021-04-21 20:04:12 -04:00
GriffinR
04af378904 Document trade sequence animation, some trade cleanup 2021-04-20 05:50:39 -04:00
GriffinR
52495e889f Doc storage - cleanup 2021-04-18 01:44:25 -04:00
ExpoSeed
f922d42988 Refactor hidden abilities 2021-04-16 23:38:35 -05:00
GriffinR
838a452363 Doc storage - choose box menu, move wallpaper gfx 2021-04-15 18:46:20 -04:00
GriffinR
a1ed59450e Doc storage - wallpaper and titles 2021-04-15 16:09:41 -04:00
AmbientDinosaur
232acab1a2
Remove superfluous define of LEVEL_UP_END 
LEVEL_UP_END is already defined in constants/pokemon.h
 2021-04-10 22:55:07 +02:00
ghoulslash
98bccaa35d Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2021-04-10 14:28:07 -06:00
GriffinR
09a9efd5c5
Merge pull request #1398 from GriffinRichards/doc-field 
Document field
 2021-04-10 13:05:51 -04:00
Kurausukun
3e725272fc standardize "grey" to "gray" 2021-04-09 22:39:34 -04:00
AmbientDinosaur
ad19b262eb
Corrected the move data for Gen 4 Overheat 
The contact flag was removed in Gen 4, and the base power was lowered in Gen 6. Currently, the changes are flipped around.
 2021-04-08 03:21:51 +02:00
ExpoSeed
8494306d1d Rename flags 2021-04-07 16:07:30 -05:00
LOuroboros
75b6d2837e Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into the_potion_seller 2021-04-07 17:10:52 -03:00
GriffinR
d717a635c8 event_object_movement cleanup 2021-04-06 17:55:29 -04:00
GriffinR
756fad0e61 Document some event object movement 2021-04-06 14:34:36 -04:00
LOuroboros
bd802ce976 Update species_names.h 2021-04-06 09:53:21 -03:00
GriffinR
802d2b2f0f Label Kyogre/Groudon anims 2021-04-06 03:46:19 -04:00
GriffinR
00c3044c96 Clarify Groudon/Kyogre/Rayquaza gfx names 2021-04-06 02:38:15 -04:00
ExpoSeed
5eed23b5d8 Razor claw effect 2021-04-05 23:19:03 -05:00
GriffinR
806abe2999 Document some objev anims, make objevgfx info static 2021-04-05 19:52:35 -04:00
ExpoSeed
afb97abba0
Merge pull request #1425 from LOuroboros/nature_names 
Decapped nature names
 2021-04-04 15:11:12 -05:00
ExpoSeed
3517baae2d Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into IE/item-use-form-change 2021-04-04 01:21:18 -05:00
ExpoSeed
cf9d5f8563 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table 2021-04-04 01:11:32 -05:00
ultima-soul
be7acc919a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-04-03 21:53:29 -07:00
LOuroboros
9f83c9b574 Implemented Stench's battle effect 
And updated its description.
 2021-04-03 23:47:10 -03:00
LOuroboros
f04f35f5c3 Added a config for the amount of HP recovered by healing items 2021-04-02 20:34:57 -03:00
ultima-soul
4a81102a46 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-02 13:57:19 -07:00
ultima-soul
b8721034ef Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-02 13:42:05 -07:00
ultima-soul
939608f5b8 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-02 13:16:40 -07:00
ghoulslash
5636706386 fix battle move data 2021-04-02 09:08:08 -06:00
BuffelSaft
35add44a90 Thousand Arrows hits airborne targets 
Thousand Arrows now hits flying types, Pokémon with Levitate, Pokémon holding an Air Balloon, and Pokémon under the effect of Magnet Rise, Telekinesis etc.
Also fixed its effect chance, which was 0 instead of 100.
 2021-03-31 23:05:30 +13:00
GriffinR
50e9666e16
Merge branch 'master' into doc-introcred 2021-03-29 20:56:15 -04:00
GriffinR
dea07dc865 Standardize intro gfx names 2021-03-29 20:48:48 -04:00
GriffinR
357c5439f5 Document some credits 2021-03-29 08:52:40 -04:00
GriffinR
c86cc8b371 Document intro, start intro_credits/credits 2021-03-28 23:13:56 -04:00
GriffinR
7a5c6d4d86 Standardize Friendship/Happiness 2021-03-27 17:27:20 -05:00
ultima-soul
7abfe7469a Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-03-23 18:41:53 -07:00
ultima-soul
56a1cab314 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-03-23 15:21:19 -07:00
ultima-soul
5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07:00
GriffinR
4077c53338 A few labels in party, start, option menus 2021-03-22 15:30:19 -05:00
GriffinR
8eafe1fd4e Move pointillism points array to src 2021-03-18 17:36:18 -05:00
LOuroboros
dea69a48ef Decapped nature names 2021-03-18 08:31:38 -03:00
BuffelSaft
7d237d8ff6 Implement Body Press' effect 
Body Press calculates damage using the user's defense stat instead of its attack. Also adds a special variant of the effect that uses the special defense stat.
 2021-03-16 22:56:44 +13:00
Blackforest92
badf8945d8 Added missing gen8 battle sprites and available icons - Fix Arceus, Palkia, Kyurem White and Black - Implement 1 tile 10 palettes system for Alcremie 2021-03-14 18:31:24 +07:00
ExpoSeed
3655fe52f3 Prison Bottle and Reveal Glass don't exist yet 2021-03-09 11:54:56 -06:00
ExpoSeed
dd73d8fc06 Fix wrong comment 2021-03-03 16:47:31 -06:00
ExpoSeed
08bd8f8403 Support form changes with PE 2021-03-03 15:34:22 -06:00
ExpoSeed
6f64c1b2b9 Implement GetFormChangeTargetSpecies 2021-03-03 13:07:50 -06:00
Evan
791fd5e709 finish berry hold effects 2021-03-03 09:25:25 -07:00
ExpoSeed
aac7028703 Add newline at end of file 2021-03-02 14:21:29 -06:00
ExpoSeed
6db5a98ad9 Delete old form change table 2021-03-02 14:20:39 -06:00
ExpoSeed
ec1a09bcd5 Revamp table 2021-03-02 14:18:34 -06:00
ExpoSeed
7802264732 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table 2021-03-01 19:38:13 -06:00
GriffinR
c6141fea83 Document easy chat 2021-02-24 11:03:45 -05:00
GriffinR
1cac608dbe Document mail 2021-02-24 11:03:39 -05:00
GriffinR
06ae5a37e2
Merge pull request #1336 from GriffinRichards/giftribbons 
Document some ribbon usage
 2021-02-24 10:07:59 -05:00
amiosi
d7d8c62753 restore and add noFlip values 
sources: vanilla emerald, pokediamond, hgss/bw2 overworlds, oras/usum menu sprites.
missing: bw2 & oras data
 2021-02-22 16:04:55 -05:00
GriffinR
fc3d6eb178
Merge pull request #1328 from GriffinRichards/doc-pokeuseitem 
Document PokemonUseItemEffects
 2021-02-22 12:15:19 -05:00
amiosi
524982d218 rock blast was unaffected by bulletproof in gen 6 
source: bulbapedia
 2021-02-19 22:25:57 -05:00
GriffinR
64fc585cc3 Document pokenav ribbons summary screen 2021-02-18 11:33:55 -05:00
SphericalIce
70ff6c3b84 Rename 'hidden' Trainers/obj events to 'buried' 2021-02-14 19:25:23 +00:00
GriffinR
8634710996 Document PokemonUseItemEffects 2021-02-12 16:02:04 -05:00
Evan
f3d975e239 merge with be 2021-02-12 08:59:55 -07:00
LOuroboros
21ee6cb9fb Added constant labels for EV manipulating item effects 2021-02-12 07:26:11 -03:00
amiosi
62c3a8ce2a spacing 2021-02-11 17:19:45 -05:00
amiosi
1df295a582 battle config and zippy zap 
plus fix mirror move mistakes
 2021-02-11 17:11:07 -05:00
amiosi
c0ba7436af water shuriken and howl 2021-02-11 16:20:13 -05:00
amiosi
172fe3a257 mirror move + nightmare fix 2021-02-11 09:49:45 -05:00
amiosi
eaf88687b9 do gen 4 king's rock 
fix some other mistakes as well
 2021-02-10 19:14:05 -05:00
amiosi
648f7343a8 old gen fixes + lock-on & psych up 
fix beat up config option as well
 2021-02-10 18:41:49 -05:00
amiosi
541f7eb7b6 targetting fixes 2021-02-10 13:57:23 -05:00
amiosi
160b08afb0 fix the rest of the flinching moves 2021-02-08 17:29:35 -05:00
amiosi
038bf42b51 kings rock Gen_X configs 2021-02-08 17:04:33 -05:00
amiosi
8416f65dac king's rock changes 2021-02-06 19:47:06 -05:00
amiosi
30434b92de update even more moves to Gen 8 standard 2021-02-06 19:41:38 -05:00
amiosi
d8e592bf46 update many moves to Gen 8 standard 2021-02-06 19:08:46 -05:00
ultima-soul
46e853c13b Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-02-03 16:23:23 -08:00
ultima-soul
daf5e0167e Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-02-03 16:06:48 -08:00
amiosi
11e6298a05 tmhm and tutor spacing 2021-02-03 15:08:53 -05:00
amiosi
762dcb8a7c cry fixes, type null 2021-02-03 14:10:39 -05:00
amiosi
b84f952f32 mistaken MrRime change 2021-02-03 13:09:09 -05:00
amiosi
663cc5b15c oricorio... 2021-02-03 13:02:13 -05:00
amiosi
418da6158b last of the cries 2021-02-03 12:57:56 -05:00
amiosi
e62f53b13e fix spacing i missed on tutors and expand to all species 
plus reorder kyurem forms to match the rest of the repo
 2021-02-02 15:18:45 -05:00
amiosi
0798ba22a6 fix tmhm spacing i missed, extend to all species 2021-02-02 15:10:45 -05:00
amiosi
a021204389 oricorio pau constants 2021-02-02 14:49:01 -05:00
amiosi
032f8ac834 tapus pls 2021-02-02 14:43:12 -05:00
amiosi
248e0b50d7 Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr 2021-02-02 14:24:36 -05:00
amiosi
9c2c337e6f tapu case 2021-02-02 14:24:15 -05:00
amiosi
f700004188 proper CamelCase 2021-02-02 14:21:00 -05:00
Evan
0483114a05 merge and some fixes 2021-02-02 11:45:15 -07:00
amiosi
dba1383d55 Merge remote-tracking branch 'upstream/pokemon_expansion' into dex-decap 2021-02-02 13:33:06 -05:00
amiosi
42ea6f482b more dex entry spacing 2021-02-02 13:32:55 -05:00
amiosi
2d6b80455d Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr 2021-02-02 13:25:53 -05:00
amiosi
47e1d6b790 MIMEJR -> MIME_JR 2021-02-02 12:36:05 -05:00
ExpoSeed
f93bd60c93
Merge pull request #1371 from LOuroboros/keldeo_resolute 
Fixed Keldeo Resolute's animation
 2021-02-02 11:18:23 -06:00
ExpoSeed
2d1384e88f
Merge pull request #1370 from LOuroboros/deoxys 
Fixed Deoxys Attack Form's animation
 2021-02-02 11:17:25 -06:00
ghoulslash
a00db597ba
Merge pull request #1383 from ultima-soul/battle_engine_sync 
Battle Engine Upstream Sync
 2021-02-02 10:02:31 -07:00
ghoulslash
47f89de53b
Merge pull request #1384 from ultima-soul/pokemon_expansion_sync 
Pokemon Expansion Upstream Sync
 2021-02-02 09:48:21 -07:00
GriffinR
7e26aa3d21
Merge pull request #1316 from GriffinRichards/doc-scrcmd 
Label remaining script commands, document some scrcmd.c, event_object_lock, trainer_see, berry tree
 2021-02-01 21:04:00 -05:00