ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 05:35:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,811 Commits 1 Branch 0 Tags 235 MiB
fdfe330330
Commit Graph

242 Commits

Author SHA1 Message Date
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
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
MandL27
6964d37db6 document UNKNOWN_A special char 2020-05-27 07:58:04 -05:00
DizzyEggg
a848c96798 Fix Tailwind string 2020-04-29 11:58:57 +02:00
DizzyEggg
98b2e88e56 Forewarn 2020-04-28 15:36:13 +02:00
DizzyEggg
d56aaf7c0b Destiny Knot 2020-04-22 14:40:44 +02:00
DizzyEggg
0f628c8ff2 Fairy Lock 2020-04-20 19:41:07 +02:00
DizzyEggg
2daf1fbbf8 Geomancy 2020-04-20 19:02:03 +02:00
DizzyEggg
6a3944d27c Frisk, would be easier if it didnt scan 2 opponents 2020-04-19 13:37:56 +02:00
DizzyEggg
e62f1475d4 Beast Boost and Receiver 2020-04-19 12:07:56 +02:00
DizzyEggg
e42ead10c9 Soul Heart 2020-04-18 19:59:09 +02:00
DizzyEggg
cbc0d8a57d Healer 2020-04-18 19:09:17 +02:00
DizzyEggg
a2813e63de Slow Start 2020-04-18 12:52:15 +02:00
DizzyEggg
34f5d9e2ae Burn Up And Purify 2020-04-17 21:14:26 +02:00
DizzyEggg
90486324c6 Animation for Tupsy Toruvy 2020-04-16 16:52:25 +02:00
DizzyEggg
d28992d2ed Anticipation clean-up 2020-04-11 12:34:53 +02:00
Eduardo Alvaro Quezada D'Ottone
6078cd3e15
Anticipation ability (#282) 2020-04-11 12:24:25 +02:00
Eduardo Alvaro Quezada D'Ottone
e1dbf8e064
Fix for Turboblaze's Battle string formatting (#281) 
* Fix for Turboblaze's Battle string formatting

* Moved the "a" down the line.
 2020-02-22 19:27:45 +01:00
LOuroboros
a1c425fffb
Fixed Bad Dreams' in battle text. (#272) 2020-02-16 13:17:00 +01:00
DizzyEggg
afe96552af Fix Unnerve string 2020-02-08 11:01:39 +01:00
DizzyEggg
eb029d557b
Merge pull request #215 from LOuroboros/aftermath 
Implemented Aftermath's effect
 2019-12-25 12:04:09 +01:00