ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-09 13:15:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,841 Commits 1 Branch 0 Tags 235 MiB
a93a8b2194
Commit Graph

303 Commits

Author SHA1 Message Date
Evan
39cbc21925 fix trainer theft, update config option 2020-12-03 08:42:12 -05:00
ultima-soul
e15a86caae Add ifdef for Hidden Abilities from Pokémon Expansion and change gBattlerAbility back to a u8. 2020-11-17 10:32:24 -08: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
Evan
a05d8f7d43 fix conflicts 2020-11-13 11:21:15 -07:00
Evan
435f928aa4 opponent trainer theft config option. Clean up code a bit 2020-11-13 11:00:44 -07:00
ultima-soul
c3423b4212
Merge pull request #1206 from ExpoSeed/type-changing-moves 
Refactor move effects for type changing moves
 2020-11-12 19:10:48 -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
ExpoSeed
d2566c8988 Refactor Multi-Attack, Judgment, and Techno Blast to use the same move effect 2020-11-07 23:34:04 -06: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
bacc831aa9 Re-apply joypad macros (minus merge conflicts) 2020-11-02 22:02:39 -03:00
aaaaaa123456789
1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
Kurausukun
fe40c0c466 re-match BattleIntroOpponent1SendsOutMonAnimation 
a lot of functions and a bit of data had to be moved from battle_main.c
to battle_util.c; I have added a note to battle_util.c stating the
reason for this
 2020-10-26 05:52:00 -04:00
Eduardo Quezada
d596fa7e12 Merge remote-tracking branch 'RHH/battle_engine' into PR-MoveSplitOption 
# Conflicts:
#	include/battle_util.h
#	include/constants/battle_config.h
#	src/battle_util.c
 2020-10-23 21:49:59 -03:00
Kurausukun
64ba8c8061 port fakematch fixes from #1155 2020-10-22 05:45:53 -04:00
LOuroboros
00bc6ab96b More review corrections 2020-10-21 16:39:06 -03:00
LOuroboros
503134167a Review corrections 2020-10-21 15:01:53 -03:00
LOuroboros
4794c63066 Reincorporated badge based stat boosts 2020-10-21 12:57:57 -03:00
Eduardo Quezada
a6e88b82ee Review changes and option to hide split icon. 2020-10-15 20:15:44 -03:00
LOuroboros
e4635525e7 Renamed the HOLD_EFFECT_EV_BOOST label 2020-10-15 04:52:03 -03:00
Eduardo Quezada
0d39b29691 Option to use Gen 3 Physical/Special split. 2020-10-15 00:16:50 -03:00
ExpoSeed
d4e58d9746 Fix style, sync moved functions properly 2020-10-13 09:40:01 -05:00
ExpoSeed
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -05:00
GriffinR
5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05: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
PokeCodec
bb5da949f2 Fix build 2020-09-08 19:44:33 -04:00
PokeCodec
e84da39d8a Match BattleIntroOpponent1SendsOutMonAnimation 2020-09-08 18:54:51 -04:00
PokeCodec
3336eb341d More adjustments 2020-09-08 14:26:37 -04:00
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02:00
PokeCodec
5f7a410359 Preparation for matching BattleIntroOpponent1SendsOutMonAnimation 2020-09-06 20:01:16 -04:00
PokeCodec
8200682b21 u8 position 2020-09-06 19:02:30 -04:00
PokeCodec
8b729cf225 While to do_while 2020-09-05 18:15:53 -04:00
PokeCodec
fe9ab67063 Change division to explicit shifts for consistency 2020-09-05 18:13:51 -04:00
PokeCodec
3ce29ee7bf Refactor Use Item 2020-09-05 17:36:10 -04:00
PokeCodec
0039542e19 Match CheckBagHasSpace 2020-09-05 14:41:43 -04:00
PokeCodec
28ef2fb774 Switch to button macros 2020-09-04 21:11:55 -04:00
PikalaxALT
135ed6a162
Merge pull request #1163 from GriffinRichards/doc-animthrow 
Minor battle_anim_throw cleanup
 2020-09-04 19:44:33 -04:00
Thomas Winwood
a529bcf0b6 Tidy up naked functions 2020-09-02 14:49:04 +01:00
GriffinR
afb3472282 Minor battle_anim_throw cleanup 2020-08-30 15:11:44 -04:00
GriffinR
09cfed64b5
Merge pull request #1146 from GriffinRichards/rename-songs 
Give songs meaningful english names
 2020-08-28 16:14:21 -04:00
PokeCodec
a04b0ff487 More formatting fixes 2020-08-28 14:35:37 -04:00
pi1024e
5faf250708 format 2020-08-28 11:59:16 -04:00
pi1024e
4ac10eb807 Make formatting corrections 2020-08-28 11:52:48 -04:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
PokeCodec
5054cff7e8 removed fakematch 2020-08-26 20:30:04 -04:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR
65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
GriffinR
4911849723 Document link contest connection 2020-08-13 16:27:40 -04:00
GriffinR
5e8ffff62f Add stat stage constants 2020-08-04 20:38:57 -04:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +02:00