ultima-soul
a8f9a54787
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-21 10:41:32 -08:00
ultima-soul
57bf1c7824
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-21 10:41:12 -08:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
BuffelSaft
a82d0681da
Implement Mr. Dollsteak's animations
...
Add animation data provided by Mr. Dollsteak for all gen 1-6 Pokémon (barring megas).
2021-11-21 11:28:46 -03:00
Eduardo Quezada D'Ottone
5500954129
Update to item descriptions based on configured effect.
2021-11-21 00:08:46 -03:00
LOuroboros
8c014e94a3
Assigned a flingPower value to the Moon Stone
2021-11-20 20:34:52 -03:00
W1serV1ser
c2f81cd5f5
Added Sky Drop
2021-11-20 11:44:48 -08:00
BuffelSaft
98712e576e
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2021-11-19 17:48:11 +13:00
BuffelSaft
16a4fc9062
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-11-19 16:33:24 +13:00
GriffinR
c940b67716
Continue macro comment updating
2021-11-17 17:45:59 -05:00
LOuroboros
7ae30f8913
I_LEGACY_HEALING_ITEMS -> I_HEALTH_RECOVERY
...
Also fixed its inaccurate description.
2021-11-17 07:15:14 -03:00
LOuroboros
ea12dfdf2c
Implemented Fling
2021-11-15 12:41:00 -03:00
GriffinR
f42eafc85b
Merge branch 'master' into doc-banim
2021-11-13 23:26:46 -05:00
Eduardo Quezada D'Ottone
70609ac742
Fixed Jacoba Berry Tree not using its own palette
2021-11-14 00:41:00 -03:00
GriffinR
4c4fa1f25e
Typo fix
2021-11-13 16:56:45 -05:00
Eduardo Quezada D'Ottone
bcbdb353f5
Adjusted elements to simplify the conflicts between BE and IE
2021-11-13 12:10:20 -03:00
Eduardo Quezada D'Ottone
492effca86
Fix Furfrou's form's backsprite coordinates
2021-11-13 07:43:12 -03:00
BuffelSaft
04867ac0d3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-11-13 17:33:25 +13:00
Eduardo Quezada D'Ottone
1f1b45e165
Review changes
2021-11-12 14:34:04 -03:00
Eduardo Quezada D'Ottone
67f78ce960
Removed comment
2021-11-11 22:43:14 -03:00
Eduardo Quezada D'Ottone
ae26a7529c
Restored FRLG items
2021-11-11 22:26:58 -03:00
ultima-soul
c74e19c062
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp
2021-11-09 20:58:19 -08:00
ultima-soul
69e3719f75
Add back TM Case, Bicycle, and Vs. Seeker. Add Poké Radar.
2021-11-09 19:19:48 -08:00
BuffelSaft
e2599c2469
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1
2021-11-10 14:31:32 +13:00
GriffinR
1548e902cd
Add MonCoods size macro
2021-11-08 09:41:23 -05:00
BuffelSaft
72d12a575d
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-11-07 12:13:18 +13:00
Eduardo Quezada D'Ottone
ae8de0f07a
Merge branch 'BattleEngine' into BE_TerrainMoves
...
# Conflicts:
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
# src/battle_util.c
2021-11-06 10:44:05 -03:00
BuffelSaft
5acebe32aa
Merge pull request #1817 from LOuroboros/photonGeyser
...
Implemented Photon Geyser and Shell Side Arm
2021-11-06 16:04:53 +13:00
BuffelSaft
4007a8d1f8
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into relic_song
2021-11-06 11:52:51 +13:00
LOuroboros
ab2dab9d05
Gave a holdEffectParam to the Adamant, Lustrous and Griseous Orbs
2021-11-05 17:42:12 -03:00
LOuroboros
5f458c9cd3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-11-05 10:58:53 -03:00
BuffelSaft
ee83d1142c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1
2021-11-05 21:40:05 +13:00
BuffelSaft
6df3975fc6
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2
2021-11-05 14:32:33 +13:00
LOuroboros
10a3c8f119
Added an item config for the Soul Dew
2021-11-04 17:29:17 -03:00
cbt6
0fe3881961
Rename WalkInPlaceFastest to WalkInPlaceFaster
2021-11-05 01:54:34 +08:00
BuffelSaft
fb62479d85
Assign Tar Shot's effect
...
Missed this change. Tar Shot works perfectly now.
2021-11-04 20:28:11 +13:00
BuffelSaft
28e78cb6c4
Gen 8 moves initial commit
...
Full credit to Nunuchu42 and cfmnephrite for this code.
2021-11-04 19:50:54 +13:00
BuffelSaft
7d10097684
Replace IsTwoStrikesMove with FLAG_TWO_STRIKES
...
Note that this flag does nothing until the Parental Bond PR is merged - it's just for the AI until then.
2021-11-04 17:11:56 +13:00
LOuroboros
af6e72ecfe
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-11-03 08:56:01 -03:00
BuffelSaft
5141e84296
Fix base stats
...
Clean up mess from testing.
2021-11-03 20:01:09 +13:00
BuffelSaft
6ce1f01b8c
Hunger Switch and Aura Wheel
...
Implement the ability Hunger Switch and the move Aura Wheel.
2021-11-03 19:45:03 +13:00
BuffelSaft
74c85b5818
Implement Relic Song's form change
...
Meloetta transforms into its pirouette form after using Relic Song, unless it has Sheer Force or the move has no effect. It also has a chance to put both targets to sleep.
2021-11-03 17:23:33 +13:00
GriffinR
afb9ff3a40
Document files with a few remaining symbols
2021-11-02 18:06:06 -04:00
cbt6
510ccbdf4c
Move definition of constants for movement speed
2021-11-03 02:56:23 +08:00
cbt6
4cedd2d551
Rename WalkFastest functions to WalkFaster
2021-11-03 01:50:53 +08:00
cbt6
a2c2d7e230
Label indexes for movement speeds
2021-11-03 01:50:47 +08:00
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