ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-23 11:50:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,273 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

657 Commits

Author SHA1 Message Date
DizzyEggg
63355d6a3b Fix no targets issue and switching faint issu 2019-08-26 14:55:55 +02:00
GriffinR
869d0eebc0
Rename atk## constants and states 2019-08-23 08:46:21 -04:00
DizzyEggg
143cb7ad35 Updated switch mechanics 2019-08-22 15:57:33 +02:00
DizzyEggg
2863045241 Fix switch-in abilities text/pop-up 2019-08-05 11:24:49 +02:00
DizzyEggg
4881e48994 Merge with master 2019-08-04 23:57:53 +02:00
DizzyEggg
df1b804af8 Merge with master 2019-08-04 23:18:49 +02:00
DizzyEggg
c219776034 Merge with master 2019-08-04 23:09:28 +02:00
PikalaxALT
20863ac85b Resolve compile warnings in modern 2019-07-18 20:46:00 -04:00
DizzyEggg
d3d9051c4a Allow evolution after exp from mon catching 2019-07-08 13:26:21 +02:00
DizzyEggg
e1ea4b62e9 Natural Gift 2019-05-20 12:03:00 +02:00
DizzyEggg
f22f7866ac Merge with master, fix conficts 2019-05-17 09:52:20 +02:00
DizzyEggg
ca51bc23bf Merge branch 'master' into item_expansion 2019-05-17 09:36:35 +02:00
DizzyEggg
33979f0fa6 use ability num instead of alt ability 2019-05-16 17:09:43 -05:00
DizzyEggg
38b320eaa5 Data for hidden abilities 2019-05-14 13:20:10 +02:00
DizzyEggg
bb8e397e5b Gems and dmg reducing berries 2019-05-07 15:26:58 +02:00
DizzyEggg
d0f91a996d Tweak up mega evo 2019-05-02 23:10:01 +02: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
77d7295607 Balls caching effects 2019-04-16 09:38:49 +02:00
DizzyEggg
93e86e6a76 Tweak Stomping Tantrum 2019-04-13 14:36:08 +02:00
DizzyEggg
2646f3b26a Merge with master 2019-04-13 13:42:44 +02:00
DizzyEggg
b0317adb8c Merge branch 'master' into pokemon_expansion 2019-04-11 13:10:35 +02:00
Phlosioneer
50350cc2e1 Merge branch 'master' into contest-ai-cleanup 2019-04-07 20:20:22 -04:00
DizzyEggg
c090f6cda9 Add Unown forms 2019-04-07 12:40:18 +02:00
DizzyEggg
f8713f9c15 Merge with master 2019-04-06 20:43:13 +02:00
Papa Cancer
43525d2a9c
Merge branch 'battle_engine_v2' into delta 2019-04-05 23:13:41 +01:00
DizzyEggg
b0223f691f Clean up data headers 2019-04-05 07:53:23 -05:00
DizzyEggg
183b714ff1 Merge with master and fix web moves 2019-04-05 12:43:44 +02:00
Phlosioneer
1360b3a477 RGB Constants 2019-04-04 17:05:46 -04:00
Phlosioneer
3a2ea40188 Rename and document more contest setup functions 
Also properly label the link contest flags variable, and label the
contest window ID's.
 2019-04-03 17:24:32 -04:00
Phlosioneer
201c0953ae Cleanup OamData entries 2019-04-02 07:41:50 -05:00
DizzyEggg
944dc4f6bf Merge with master 2019-04-01 13:40:42 +02:00
DizzyEggg
b12334c88b Remove cases from ABE, add functionality of Flower Veil 2019-03-31 21:38:58 +02:00
Marcus Huderle
462b196abc Give battle_anim files appropriate names 2019-03-31 12:15:39 -05:00
Papa Cancer
ebe2dc6bbb Mat Block 
Nothing more needs to be said
 2019-03-31 17:17:13 +01:00
DizzyEggg
54ab6b43dc Merge with master 2019-03-22 10:40:31 +01:00
Phlosioneer
9848f84b9e Use constants for Oam .shape and .size fields 
Also some general formatting fixes for constants.
 2019-03-16 12:37:04 -05:00
Phlosioneer
5886f82ef5 Merge branch 'master' into extern-cleanup 2019-03-08 02:45:26 -05:00
DizzyEggg
fddb5159b4 Merge with master 2019-03-05 21:46:45 +01:00
Phlosioneer
4ea5e85bed Fix typos 
This is an updated version of #554, since it hasn't been updated in two
weeks.
 2019-03-03 09:31:47 -06:00
Phlosioneer
3ceb1667c9 Reduce externs 2019-03-01 22:32:50 -05:00
DizzyEggg
a001faeced New AI command for using priority moves in death situatiions 2019-02-16 14:54:17 +01:00
DizzyEggg
f415871369 Merge with master 2019-02-03 10:44:05 +01:00
DizzyEggg
a740bc7190 Name action 11 2019-02-02 11:32:00 +01:00
DizzyEggg
a42bba755b Add Crafty Shield effect 2019-02-01 14:34:16 +01:00
DizzyEggg
d46e60765d Rename a palace battle field 2019-01-29 22:22:02 +01:00
DizzyEggg
7bc4a3b3f7 Merge with master 2019-01-29 22:12:53 +01:00
Marcus Huderle
e81838dba3 Misc. documentation and move some data into .c files 2019-01-29 14:36:02 -06:00
DizzyEggg
736826e863 New feature - battle 2 vs 1 opponent 2019-01-27 20:54:34 +01:00
DizzyEggg
abd518b668 Refactor GF's idiotic coding 2019-01-27 13:52:02 +01:00
DizzyEggg
2c3210f4d1 merge with master 2019-01-18 22:30:34 +01:00