ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 20:17:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,679 Commits 1 Branch 0 Tags 235 MiB
e64b810463
Commit Graph

2026 Commits

Author SHA1 Message Date
DizzyEggg
e64b810463 Fix Dragon Pulse and Shadow Force animations 2020-02-17 10:55:55 +01:00
DizzyEggg
7c81accf7b Switch-in abilities for megas 2020-02-16 13:34:25 +01:00
LOuroboros
0bccf91f1a
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273) 2020-02-16 13:14:18 +01:00
Eduardo Alvaro Quezada D'Ottone
33e8e20118
Disguise ability (#258) 
* Protection from attacks.

* Changes form when Busting Disguise.

* Ability changing moves set to fail.

- Simple Beam and Worry Seed now fail if the target has Disguise.
- Role Play and Skill Swap now fail if either the attacker or the target have Disguise.

* Disguise no longer triggers when transformed.

* Mimikyu reverts to Disguised

* No longer blocks from entry hazards and weather.

* Applied review changes

* Oops, new line

* yeah
 2020-02-08 19:29:51 +01:00
DizzyEggg
97eaf8b559 Fix Shadow Claw anim 2020-02-08 12:22:10 +01:00
DizzyEggg
e7d5ebb3b6 Make Charge raise sp.def 2020-02-08 11:55:16 +01:00
LOuroboros
6d39eb8826
Fixed Charge Beam's animation. (#252) 2020-02-08 11:41:44 +01:00
DizzyEggg
8889039a57 Merge with master 2020-01-31 21:15:08 +01:00
GriffinR
6f392632c2 Note AI weather bug 2020-01-22 18:05:42 -05:00
DizzyEggg
4a5a84e5c7 Facade AI fix; AI uses fake out more often 2020-01-19 11:07:09 +01:00
DizzyEggg
a6bf183653 Fix Aegi ability pop up sliding 2020-01-18 20:33:46 +01:00
DizzyEggg
1d13004a0b Fix Power Gem anim 2020-01-18 20:28:36 +01:00
DizzyEggg
5c486c15dd Fix Moxie battler 2020-01-18 19:40:49 +01:00
DizzyEggg
06a9165f75 Fix Ice Body not working 2020-01-18 19:18:57 +01:00
DizzyEggg
d8aab3d112 Merge with master 2020-01-18 18:17:25 +01:00
jiangzhengwenjz
aa631825fc resolve data sections 2020-01-16 08:14:27 -06:00
jiangzhengwenjz
8a5f292618 document symbols 2020-01-16 08:14:27 -06:00
GriffinR
22931846d6 Fix Colosseum name porymap issue 2020-01-13 20:20:48 -06:00
huderlem
6d6c57f383
Merge pull request #953 from GriffinRichards/sync-script 
Port some macro/script fixes from pokefirered
 2020-01-13 19:33:47 -06:00
GriffinR
96720db083 Remove unnecessary removeitem arguments 2020-01-12 23:29:19 -05:00
GriffinR
c19289596d Give/Take to Add/Remove for silent script macros 2020-01-12 23:24:52 -05:00
huderlem
fa5816915d
Merge pull request #949 from GriffinRichards/doc-dome 
Document Battle Dome and add facility party constants
 2020-01-12 20:10:03 -06:00
GriffinR
10220d3b76 Label TryRecordMixLinkup 2020-01-12 19:39:30 -06:00
GriffinR
e736c2d2fd Document some easy chat specials 2020-01-12 19:39:30 -06:00
GriffinR
c27a4778ee Standardize prebattle -> intro 2020-01-12 19:39:30 -06:00
GriffinR
6a470ddfda Some script clean up, document secret base secrets show 2020-01-12 19:39:30 -06:00
GriffinR
e497fc64e3 if_undefeated macro to if_not_defeated 2020-01-12 20:20:02 -05:00
GriffinR
f2e7b1507e Port some macro/script fixes from pokefirered 2020-01-11 14:12:31 -05:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome 2020-01-08 01:15:36 -05:00
GriffinR
fb5bea98ce More battle_dome.c doc 2020-01-07 22:30:37 -05:00
DizzyEggg
952bdbd9f5 Steadfast string fix 2020-01-04 18:41:59 +01:00
DizzyEggg
d21449e19c Fix Lava Plume animation in double battles 2020-01-01 10:57:27 +01:00
DizzyEggg
39e3b0b740 Form changes layout and Stance Change Aegi 2019-12-31 19:11:53 +01:00
DizzyEggg
b15f0b3bb3 Comatose 2019-12-31 16:36:53 +01:00
DizzyEggg
4c9ea32d19 Merge with master 2019-12-30 18:52:23 +01:00
huderlem
3b05398975
Merge pull request #945 from Fontbane/patch-5 
Give rival and Maxie parties better names
 2019-12-28 12:06:35 -06:00
GriffinR
3efc8199d4 More battle_dome.c documentation 2019-12-25 22:27:33 -08:00
Fontbane
31b4656324 Labels better 2019-12-25 22:39:06 -05:00
huderlem
ee61726136
Merge pull request #936 from GriffinRichards/doc-tower 
Document Battle Tower scripts
 2019-12-25 11:39:20 -06:00
DizzyEggg
eb029d557b
Merge pull request #215 from LOuroboros/aftermath 
Implemented Aftermath's effect
 2019-12-25 12:04:09 +01:00
LOuroboros
3367bdaf51 Made Aftermath trigger the Ability Pop Up sign 2019-12-23 14:17:54 -03:00
DizzyEggg
308e1594c9
Merge pull request #212 from Fontbane/gooey 
Queenly Majesty, Big Pecks, Gooey and Tangling Hair
 2019-12-23 17:23:33 +01:00
DizzyEggg
e4a9a228c5
Merge pull request #210 from ultima-soul/battle_engine 
Implement Leaf Guard.
 2019-12-23 17:15:51 +01:00
DizzyEggg
9e3d5672e6 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-12-23 16:40:21 +01:00
LOuroboros
c690d577a5 Implemented Aftermath's effect 2019-12-21 05:01:42 -03:00
Diegoisawesome
026e1108b2
Merge pull request #935 from GriffinRichards/doc-warp 
Document some warp/field screen effect
 2019-12-20 23:44:56 -08:00
GriffinR
ff2d8a9c4e Add frontier trainer constants 2019-12-20 21:14:05 -05:00
GriffinR
63c8cf97d1 Document Battle Dome scripts and some battle_dome.c 2019-12-20 16:53:33 -05:00
Fontbane
2fb6ea4fc4 Big Pecks 2019-12-19 14:01:46 -05:00
GriffinR
9e08cfe55f Remove uses of compare_var_to 2019-12-18 19:22:39 -05:00