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,099 Commits 1 Branch 0 Tags 235 MiB
5d037198b3
Commit Graph

216 Commits

Author SHA1 Message Date
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
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
DizzyEggg
15d34c3513 Fix strings coz they had the same name for some unknown to me reason 2019-12-23 17:09:13 +01:00
LOuroboros
c690d577a5 Implemented Aftermath's effect 2019-12-21 05:01:42 -03:00
DizzyEggg
dcb5d16cb3 Merge with master 2019-11-29 21:47:31 +01:00
GriffinR
63ee15fc28 Document Frontier Util 2019-11-25 18:37:48 -06:00
DizzyEggg
8cc0439182 merge master 2019-11-22 22:47:19 +01:00
GriffinR
5e01871f8b Document Trainer Hill 2019-11-16 13:02:35 -06:00
GriffinR
a3ee92a4e7 Document some frontier util funcs 2019-11-10 16:37:14 -06:00
DizzyEggg
1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01:00
GriffinR
ca2c6fa9b1 Document pc_transfer.inc 2019-10-22 17:57:28 -05:00
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
GriffinR
5325835ee7 Use STR_CONV constants 2019-09-30 15:43:44 -04:00
DizzyEggg
c9de753ecc Illusion 2019-08-08 13:06:55 +02:00
DizzyEggg
0dd9a3dd0c Fix Stealth Rock msg and target 2019-08-05 12:26:53 +02:00
DizzyEggg
2863045241 Fix switch-in abilities text/pop-up 2019-08-05 11:24:49 +02:00
DizzyEggg
d1fa9c24cc Fix Wory Seed string 2019-07-07 09:58:36 +02:00
DizzyEggg
65be7868ec Fix string 2019-05-23 12:38:41 +02:00
DizzyEggg
76c5287629 Bug Bite 2019-05-23 12:32:14 +02:00
DizzyEggg
824a95fe07 Incinerate 2019-05-10 15:12:33 +02:00
DizzyEggg
875b413a09 Various battle target items 2019-05-09 20:31:58 +02:00
DizzyEggg
bb8e397e5b Gems and dmg reducing berries 2019-05-07 15:26:58 +02:00
Papa Cancer
b50007e861 Instruct 
Re-PR'd due to excess "merges"
 2019-04-20 20:11:49 +01:00
Papa Cancer
7e99272482 Laser Focus 
Re-PR'd due to excess "merges"
 2019-04-20 20:02:52 +01:00
Papa Cancer
c4acc3dbf8
Merge branch 'battle_engine_v2' into beta 2019-04-20 16:49:57 +01:00
Papa Cancer
754befe393 Baneful Bunker + King's Shield 
Both apply a move effect from atk49. King's Shield swaps attacker and defender for the sake of Defiant etc. and then swaps them back!
 2019-04-17 14:54:21 +01:00
Papa Cancer
e5e45bbcf5 Throat Chop 
Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
 2019-04-17 13:52:25 +01:00
DizzyEggg
f8713f9c15 Merge with master 2019-04-06 20:43:13 +02:00