surskitty
|
a0f1dcb9cf
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine
|
2021-01-10 15:40:21 -05:00 |
|
ultima-soul
|
d2d961e447
|
Merge pull request #1262 from LOuroboros/gen8_abilities_BE
Implemented various Gen. 8 abilities
|
2021-01-07 13:31:17 -08:00 |
|
LOuroboros
|
8511ed57e4
|
Tweaked Steam Engine's battle string
|
2021-01-07 18:13:16 -03:00 |
|
LOuroboros
|
517c8ffdd0
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities_BE
|
2021-01-03 22:05:14 -03:00 |
|
ExpoSeed
|
7dadcb94b8
|
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
|
2021-01-03 17:14:43 -06:00 |
|
surskitty
|
aa9796a6ae
|
Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip.
|
2020-12-31 18:57:36 -05:00 |
|
LOuroboros
|
2b0702ec04
|
Implemented Perish Body
Inspired by Raguzero's implementation.
|
2020-12-11 19:44:32 -03:00 |
|
LOuroboros
|
7d8b8083e8
|
Implemented Sand Spit
|
2020-12-11 16:47:23 -03:00 |
|
Kurausukun
|
58976ebaa8
|
Merge remote-tracking branch 'upstream/master' into berry_crush
|
2020-12-10 23:30:52 -05:00 |
|
LOuroboros
|
322918e280
|
Implemented Steam Engine
And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.
|
2020-12-10 18:27:35 -03:00 |
|
LOuroboros
|
6a0fee9c56
|
Fixed Intrepid Sword and Dauntless Shield
And also introduced a new BattleString for BattleScript_BattlerAbilityStatRaiseOnSwitchIn
|
2020-12-05 14:03:13 -03:00 |
|
LOuroboros
|
6bbd88049a
|
Ball Fetch tweaks
|
2020-12-05 03:03:55 -03:00 |
|
LOuroboros
|
9e1d7cc827
|
Implemented Ball Fetch
|
2020-12-02 23:09:35 -03:00 |
|
Evan
|
5c72a89105
|
fix B_BUFF_ABILITY
|
2020-12-02 15:03:49 -05:00 |
|
ExpoSeed
|
aa7facf57b
|
Merge pull request #1243 from ghoulslash/abilities
Finish Switch In Ability Activation Messages
|
2020-11-28 20:27:32 -06:00 |
|
Evan
|
56c0a39206
|
fix pressure typo
|
2020-11-19 11:53:47 -07:00 |
|
Evan
|
07a4400d50
|
finish switch in ability messages
|
2020-11-19 11:42:00 -07:00 |
|
ultima-soul
|
e32659d4bb
|
Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities.
|
2020-11-16 13:50:26 -08:00 |
|
Eduardo Quezada D'Ottone
|
e6f8d57f08
|
Merge remote-tracking branch 'RHH/battle_engine' into BE-WishMegaEvo
# Conflicts:
# include/constants/battle_string_ids.h
|
2020-11-10 17:28:17 -03:00 |
|
LOuroboros
|
a25190f357
|
A few things.
-Introduced a Gen. 8 styled text string for Intimidate
-Added an ability popup to BattleScript_IntimidatePrevented
|
2020-11-10 10:34:51 -03:00 |
|
Eduardo Quezada D'Ottone
|
255a14affb
|
Review changes 2.
|
2020-11-08 21:03:50 -03:00 |
|
ultima-soul
|
99fdc13e61
|
Merge branch 'master' into battle_engine_sync
|
2020-11-07 15:59:20 -08:00 |
|
Eduardo Quezada D'Ottone
|
09a5d6c722
|
Implemented Wish Mega Evolution
|
2020-11-07 10:13:32 -03:00 |
|
Kaz
|
171154a097
|
Convert to -g; will be required for eliminating fakematches.
|
2020-09-16 19:36:30 -04:00 |
|
aaaaaa123456789
|
7dc95a0103
|
Undo PokeCodec's PRs
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.
Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
|
2020-09-13 06:30:55 -03:00 |
|
DizzyEggg
|
97d0643110
|
Merge with master
|
2020-09-08 12:48:28 +02:00 |
|
GriffinR
|
7c8bc0fbe3
|
Merge pull request #1149 from PokeCodec/datatypes
gflib documenting
|
2020-09-01 14:25:21 -04:00 |
|
DizzyEggg
|
f70a9ce153
|
Merge with master
|
2020-08-27 12:01:28 +02:00 |
|
PokeCodec
|
86a1e89879
|
Documentation of unk field
|
2020-08-23 21:34:31 -04:00 |
|
GriffinR
|
3014241179
|
Give songs meaningful english names
|
2020-08-20 19:06:14 -04:00 |
|
GriffinR
|
7d3b68a27b
|
Fix Champinship typo
|
2020-08-18 17:51:51 -04:00 |
|
GriffinR
|
cc4255d4c0
|
Add some charmap constant usage
|
2020-08-11 00:23:28 -04:00 |
|
GriffinR
|
5e8ffff62f
|
Add stat stage constants
|
2020-08-04 20:38:57 -04:00 |
|
DizzyEggg
|
9bc4395212
|
bizzara revied typos
|
2020-07-31 09:45:19 +02:00 |
|
DizzyEggg
|
427bad6413
|
Fix Switch-in ability battler sometimes not properly printed
|
2020-07-28 10:18:44 +02:00 |
|
DizzyEggg
|
c576da5397
|
Fix Forewarn typo
|
2020-07-27 21:15:27 +02:00 |
|
DizzyEggg
|
0066640a1e
|
Merge with master
|
2020-07-27 14:51:39 +02:00 |
|
GriffinR
|
a4e47f1201
|
Clean some battle_message.c data
|
2020-07-23 05:01:42 -04:00 |
|
GriffinR
|
aba42513d3
|
Clean up some battle scr cmd data
|
2020-07-18 18:10:15 -04:00 |
|
DizzyEggg
|
62dc94e9c8
|
Merge with master
|
2020-07-15 10:13:19 +02:00 |
|
GriffinR
|
0c4f3b269e
|
Merge pull request #1083 from GriffinRichards/playse-constants
Use charmap constants for PLAY_SE
|
2020-07-15 02:53:53 -04:00 |
|
DizzyEggg
|
4c3f40a361
|
Merge with master
|
2020-07-11 12:59:23 +02:00 |
|
DizzyEggg
|
3bdf675221
|
Hopefully illusion works as intended now
|
2020-06-28 19:45:48 +02:00 |
|
GriffinR
|
7d5ad8f7b4
|
Use charmap constants for PLAY_SE
|
2020-06-26 02:44:07 -04:00 |
|
DizzyEggg
|
fde2c25b3f
|
Merge pull request #434 from LOuroboros/freeze_shock
Fixed Freeze Shock
|
2020-06-22 10:04:43 +02:00 |
|
LOuroboros
|
5f763a8380
|
Fixed Freeze Shock's 1st turn battle string
|
2020-06-16 04:11:37 -03:00 |
|
LOuroboros
|
2fb4c0cab1
|
Corrected Electrify's battle string
|
2020-06-16 02:58:58 -03:00 |
|
GriffinR
|
9190af73b7
|
Label union room battle trainer
|
2020-06-03 15:28:29 -04:00 |
|
DizzyEggg
|
013f9b6a17
|
merge wiith masteer and summary screen change
|
2020-05-29 12:50:54 +02:00 |
|
MandL27
|
c3d690a380
|
consistency with pokefirered
|
2020-05-27 07:58:04 -05:00 |
|