ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-09 21:25:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,961 Commits 1 Branch 0 Tags 235 MiB
06b4548603
Commit Graph

630 Commits

Author SHA1 Message Date
MissingNoL
c876de5a5b Done! Merge branch 'battle_engine' into Photon_Geyser 2021-06-05 17:40:06 -07:00
MissingNoL
f30a9542ee Problem: Photon Geyser is calculating as Shell Side Arm?? Needs: Poison effect, contact move for Shell Side Arm 2021-05-27 22:21:55 -07:00
ghoulslash
c356ffaed4 merge with be. fix null ptr check in GetBattleMoveSplit 2021-05-24 10:46:53 -06:00
ghoulslash
5840b1f0ed utility umbrella effect 2021-05-24 09:52:45 -06:00
ghoulslash
c3e28e9b1a merge with be 2021-05-23 12:22:52 -06:00
gAlfonso-bit
9a195c0fef Cherry-pick roamer bug fix from pokefirered 
Adapted https://github.com/pret/pokefirered/blob/master/src/battle_main.c#L3831 to pokeemerald
 2021-05-13 11:23:42 -05:00
ultima-soul
cf0fd961b9 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-28 23:56:58 -07:00
ultima-soul
00c3f060b1 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-28 23:53:23 -07:00
ultima-soul
56fc420187 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-28 21:34:30 -07:00
ultima-soul
75a9fdbafa Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-28 20:50:59 -07:00
ultima-soul
0da3f74a7e Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-28 18:58:38 -07:00
ultima-soul
14a0303e2f Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-27 18:36:37 -07:00
GriffinR
aad090e154 Document TV 2021-04-26 12:35:35 -04:00
GriffinR
f94540c2b8 Misc reg constant cleanup 2021-04-15 03:14:42 -04:00
GriffinR
62abcecc54 More usage of DISPLAY constants 2021-04-15 02:22:24 -04:00
Marcus Huderle
e92d2005c4 Use designated initializers for gTypeNames 2021-04-12 17:41:16 -05:00
ExpoSeed
2bbab03eba
Merge pull request #1430 from LOuroboros/decap_battle_types 
Decapped the in battle type strings
 2021-04-04 15:11:13 -05:00
ultima-soul
be7acc919a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-04-03 21:53:29 -07:00
GriffinR
9ea9ffde09 Add remaining multistring chooser constants 2021-04-03 11:49:06 -04:00
ultima-soul
4a81102a46 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-02 13:57:19 -07:00
ultima-soul
b8721034ef Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-02 13:42:05 -07:00
ultima-soul
939608f5b8 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-02 13:16:40 -07:00
ghoulslash
d89e2c1775 merge with be 2021-04-02 08:55:54 -06:00
LOuroboros
66e86e3aac Decapped the in battle type strings 2021-03-31 00:47:57 -03:00
GriffinR
8c6e89e994 Bit shifts from hex to decimal 2021-03-30 17:38:09 -04:00
ghoulslash
a595b213b4 merge with be 2021-03-28 17:29:22 -06:00
ultima-soul
7abfe7469a Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-03-23 18:41:53 -07:00
ultima-soul
56a1cab314 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-03-23 15:21:19 -07:00
ultima-soul
5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07:00
PikalaxALT
925e68c03f Update newly named fields 2021-03-15 15:22:41 -04:00
PikalaxALT
8d4dcb228a More documentation in battle_main 2021-03-12 16:55:58 -05:00
PikalaxALT
e32a1571af Resolve link comm buffers in gBattleStruct 2021-03-12 15:37:31 -05:00
PikalaxALT
e6b1b97aa1 Nonmatching resoltuion 
- Fix fakematch in Cmd_get_used_held_item
- Remove `static` overrides in MODERN in four objects
 2021-03-12 13:55:07 -05:00
GriffinR
55a40b901f Label battle tower link script 2021-03-04 19:30:19 -06:00
Evan
2ccdf1d89e merge with be. magic guard checks 2021-03-03 09:21:06 -07:00
ghoulslash
bcb6fe154b
Update src/battle_main.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 09:14:00 -07:00
Evan
b130396c0e merge with be 2021-03-01 17:05:10 -07:00
Evan
55b8538f68 merge with be 2021-03-01 11:22:37 -07:00
ultima-soul
ef054c5d48
Merge pull request #1342 from ghoulslash/fixes 
Magic Room Affects Macho Brace/Power Item Speed Drop
 2021-03-01 08:50:59 -08:00
GriffinR
b71b10623b Add palette selection constants 2021-02-24 11:03:51 -05:00
GriffinR
8634710996 Document PokemonUseItemEffects 2021-02-12 16:02:04 -05:00
Evan
f3d975e239 merge with be 2021-02-12 08:59:55 -07:00
ultima-soul
46e853c13b Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-02-03 16:23:23 -08:00
ultima-soul
daf5e0167e Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-02-03 16:06:48 -08:00
Evan
0483114a05 merge and some fixes 2021-02-02 11:45:15 -07:00
ultima-soul
5fdb578747 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-02-01 15:58:18 -08:00
ultima-soul
2a20d50904 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-02-01 15:54:08 -08:00
Evan
f428e5e2dc some quick claw/custap berry fixes 2021-01-31 23:31:27 -07:00
ultima-soul
96232ea166 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-01-28 23:59:08 -08:00
Evan
c009b51ae8 add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot 2021-01-28 13:27:00 -07:00
GriffinR
a392cca928 Misc battle documentation 2021-01-23 00:40:31 -05:00
GriffinR
c106f7f130 Document battle_controller_opponent.c 2021-01-22 21:35:16 -05:00
GriffinR
63a7828772 Document battle_controller_player.c 2021-01-22 20:03:27 -05:00
GriffinR
4eca05ccf5 Document remainder of battle_controllers.c 2021-01-22 02:48:22 -05:00
Evan
4611c71bd1 merge with be 2021-01-21 08:55:14 -07:00
Evan
e61309dce6 merge with be 2021-01-20 17:34:24 -07:00
Evan
16d54b6d32 merge with be, add form checks to CanBattlerGetOrLoseItem 2021-01-20 14:28:03 -07:00
Evan
6b59a9ac01 add ai info debug option 2021-01-19 12:58:58 -07:00
GriffinR
bc20fda604 Use GET_UNOWN_LETTER macro 2021-01-19 04:03:16 -05:00
Evan
9902f6e603 merge with be 2021-01-13 14:32:14 -07:00
Evan
8ef6a2c80d merge with be 2021-01-13 14:23:30 -07:00
GriffinR
b9e1b050e1 Label remaining battle types 2021-01-13 15:20:29 -05:00
Evan
56395a060f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2021-01-13 09:23:07 -07:00
ultima-soul
3cb09b6507 Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into deoxys_handling_removal 2021-01-11 15:19:11 -08:00
Evan
8bad377a2e magic room affects macho brace/power item speed drop 2021-01-10 16:57:27 -07:00
Evan
1e22ae4cf2 merge with be 2021-01-10 09:08:25 -07:00
Evan
e748db8ef4 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2021-01-10 08:58:16 -07:00
Evan
6dabff1ee3 merge with be 2021-01-07 21:24:21 -07:00
Evan
5eb49722c0 add red card effect 2021-01-07 19:33:39 -07:00
SphericalIce
3c2a33b9b2 Use constants for max IVs & the random IV generation flag 2021-01-07 22:13:14 +00:00
ultima-soul
d2d961e447
Merge pull request #1262 from LOuroboros/gen8_abilities_BE 
Implemented various Gen. 8 abilities
 2021-01-07 13:31:17 -08:00
Evan
f2e486eb0d custap berry effect, custap/quick claw activation message 2021-01-06 09:37:31 -07:00
ExpoSeed
7dadcb94b8 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-03 17:14:43 -06:00
ExpoSeed
10f4b48215 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-01 14:14:51 -08:00
ExpoSeed
208e0abe04 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2020-12-31 18:44:43 -06:00
GriffinR
769ddf22c2 Label remaining subs in battle_tower.c 2020-12-24 16:18:47 -05:00
ultima-soul
6a0939cd4e Remove special handling for Deoxys. 2020-12-21 22:39:19 -08:00
Evan
7988a1f41d Ai_TryOnAlly and reorganize files 2020-12-20 14:47:20 -07:00
Evan
916d0416e3 outline AI_CheckGoodMove 2020-12-15 21:57:33 -07:00
Evan
67fefd0261 var terrain, surge fixes 2020-12-13 19:42:48 -07:00
Kurausukun
58976ebaa8 Merge remote-tracking branch 'upstream/master' into berry_crush 2020-12-10 23:30:52 -05:00
Evan
34dd11448b sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem 2020-12-09 10:28:18 -07:00
Evan
21cab1b7a7 better negative totem boost system, totems occur before switch in abilities 2020-12-05 21:00:51 -07:00
LOuroboros
6bbd88049a Ball Fetch tweaks 2020-12-05 03:03:55 -03:00
Evan
39cbc21925 fix trainer theft, update config option 2020-12-03 08:42:12 -05:00
LOuroboros
9e1d7cc827 Implemented Ball Fetch 2020-12-02 23:09:35 -03:00
Evan
4ad5e368a9 fix merge conflicts 2020-12-01 17:57:57 -05:00
Evan
25abdeacc5 tidy up z move code 2020-12-01 16:36:44 -05:00
Evan
2bfc7ea9b1 merge upstream 2020-12-01 15:42:04 -05:00
Evan
ce19e33cc4 handle double and multi battles 2020-12-01 13:43:15 -05:00
Evan
348d70b309 z move indicator and some data 2020-11-26 15:56:18 -05:00
Evan
99d9a36860 add totem boosts 2020-11-19 10:35:37 -07: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
68627882a5 Merge remote-tracking branch 'pret/master' into PE-pretSync 2020-11-07 15:00:10 -03:00
Eduardo Quezada D'Ottone
8d86169283 Merge remote-tracking branch 'pret/master' into IE-pretSync 2020-11-07 14:54:52 -03: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
ce3b877666 Dive Ball config. 2020-10-17 02:33:15 -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
Eduardo Quezada
86334ca011 0 for SPECIES_NONE 2020-10-14 20:50:33 -03:00
Eduardo Quezada
34ce08db0b Added Karrablast/Shelmet evolution method. 2020-10-14 20:16:18 -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
ExpoSeed
c3113b43bb Merge branch 'item_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-item-expansion 2020-10-04 02:36:07 -05:00
ExpoSeed
5794fc69e8 Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-pokemon-expansion 2020-10-04 02:35:23 -05:00
GriffinR
5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05:00
Kaz
847878eae9 battle_gfx_sfx_util.c: Very annoying fakematch fix. 
daycare.c: -g eliminates the need for the brace hack.
battle_transition.c: Fix Phase2_Ripple_Func2...?
 2020-09-19 17:12:25 -04: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
DizzyEggg
448599f53c Merge with master 2020-09-08 12:01:20 +02:00
DizzyEggg
271219f962 Merge with master 2020-09-08 12:00:51 +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
DizzyEggg
c2733236be Merge with master 2020-08-27 11:36:35 +02:00
DizzyEggg
35559d6b71 Merge with master 2020-08-27 10:58:31 +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
43359f39c3 Merge with master 2020-07-27 15:28:03 +02:00
DizzyEggg
11c2207839 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-07-27 14:54:32 +02:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +02:00
GriffinR
aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
DizzyEggg
6537310387 Merge with master 2020-07-15 10:23:58 +02:00
DizzyEggg
62dc94e9c8 Merge with master 2020-07-15 10:13:19 +02:00
GriffinR
a583dfcc42
Merge pull request #1094 from DizzyEggg/rename 
Give proper names to some functions
 2020-07-14 19:56:46 -04:00
GriffinR
c177872c9c
Merge pull request #1080 from AsparagusEduardo/EndBalls 
Created constant for easier Ball Expansion.
 2020-07-14 19:56:20 -04:00
DizzyEggg
0425cb66ef Give proper names to some functions 2020-07-14 11:13:03 +02:00
Eduardo Quezada
b31efcd6e3 Renamed constant, 2020-07-12 01:49:32 -04:00
DizzyEggg
ff5fc97859 Merge with master 2020-07-11 14:07:10 +02:00
DizzyEggg
4c3f40a361 Merge with master 2020-07-11 12:59:23 +02:00
DizzyEggg
e03fea84d0 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-07-11 12:46:41 +02:00
DizzyEggg
52c63cd671 lightning rod no longer redirects mold braker 2020-07-02 11:58:48 +02:00
DizzyEggg
3bdf675221 Hopefully illusion works as intended now 2020-06-28 19:45:48 +02:00
DizzyEggg
f19ba68cb9 Fix mega indicator sprite overwriting ram 2020-06-24 12:55:08 +02:00
Eduardo Quezada
7244b80fc6 Created constant for easier Ball Expansion. 2020-06-21 02:36:46 -04:00
GriffinR
9190af73b7 Label union room battle trainer 2020-06-03 15:28:29 -04:00
ultima-soul
9ee5db6a96 Expand ability ids to u16. Thanks to ghoulslash for some assistance! 2020-05-18 14:54:12 -07:00
DizzyEggg
f71f1c9d62 Possibly fix gem issue 2020-04-29 11:53:03 +02:00
DizzyEggg
36b52eb063 Shed Shell 2020-04-28 11:14:20 +02:00
DizzyEggg
e2524bed49 Metronome item 2020-04-22 12:49:25 +02:00
DizzyEggg
0f628c8ff2 Fairy Lock 2020-04-20 19:41:07 +02:00
Eduardo Alvaro Quezada D'Ottone
4697a5b687
More Battle configs (#339) 
* Fixed naming of King Shield's description variable.

* Config for King Shield lowering attack.

* Config for terrain type attack boost.

* Standarized battle config descriptions.

* Adjusted config logic accounting for GEN_8.

* Changed KING_S_SHIELD back to KINGS_SHIELD

* Missed B_ABILITY_WEATHER.
 2020-04-20 14:11:28 +02:00
DizzyEggg
a2813e63de Slow Start 2020-04-18 12:52:15 +02:00
DizzyEggg
88bdeed1a6 Merge with master 2020-04-15 14:40:16 +02:00
DizzyEggg
09dcff81f8 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-04-15 13:28:10 +02:00
DizzyEggg
83b251a69c Stamina, Liquid Voice, Water Compaction 2020-04-15 09:37:12 +02:00
DizzyEggg
8f61445dfe Berserk 2020-04-12 12:41:26 +02:00
DizzyEggg
060b795d8e Merge with master 2020-04-11 19:48:24 +02:00
DizzyEggg
1435cd4692 Change inner structure of semi invulerable moves 2020-04-11 11:47:13 +02:00
AsparagusEduardo
f45336c546 Using Battle Action constants 2020-03-17 22:14:14 -03:00
DizzyEggg
13c0c64d70 Merge with master 2020-02-23 12:41:36 +01:00
DizzyEggg
5054727167 Allow second mon to throw a ball if first dead 2020-02-16 13:24:50 +01:00
DizzyEggg
360665fac8 Fix ability preventing escape string 2020-02-09 11:02:22 +01:00
DizzyEggg
153d2ac823 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-02-08 15:42:14 +01:00
DizzyEggg
14bc2f65f3 Fix AI trying to switch when it can't, also ghosts can escape 2020-02-08 14:20:02 +01:00
Eduardo Alvaro Quezada D'Ottone
90442ffbc2
Battle config options (#243) 
* Option to use pre-GenVI critical hit multiplier.

* Clarified the option that multiplies EXP by 1.5 for trainer battles.

* Fixed code style.

* Option to change Burn damage.

* Option to change to Gen 7 paralysis drop.

* Ordered settings.

* Implemented review suggestions.
 2020-02-08 09:51:55 +01:00
DizzyEggg
834b7b52d3 Merge with master 2020-02-08 09:38:29 +01:00
GriffinR
27c4329e45 Use friendship event constants 2020-02-04 12:16:15 -06:00
DizzyEggg
044f070020 Merge with master 2020-01-18 15:04:56 +01:00
DizzyEggg
39e3b0b740 Form changes layout and Stance Change Aegi 2019-12-31 19:11:53 +01:00
DizzyEggg
4c9ea32d19 Merge with master 2019-12-30 18:52:23 +01:00
DizzyEggg
cd4c3b38b5 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-12-30 13:53:59 +01:00
GriffinR
ddfa0c6298 Document Battle Tower scripts 2019-12-17 20:56:13 -05:00
DizzyEggg
c65900b67a merge 2019-11-10 14:13:23 +01:00
DizzyEggg
791ed999d9 Merge 2019-11-10 12:40:11 +01:00
DizzyEggg
b4ac979600 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-11-10 12:09:43 +01:00
DizzyEggg
ea6736cd8d merge 2019-11-10 12:09:14 +01:00
Marcus Huderle
01e6fb6dd0 Document some battle_bg-related things 2019-11-07 18:24:04 -06:00
huderlem
a4b4ecd470
Merge pull request #787 from GriffinRichards/rename-tablecmds 
Rename table cmds
 2019-11-04 16:31:27 -06:00
DizzyEggg
1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01:00
GriffinR
27169f634b Review changes for party menu doc 2019-10-31 21:33:01 -04:00
GriffinR
e01ec84837 Document party_menu second pass 2019-10-31 03:25:56 -04:00
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
DizzyEggg
e736c369d6 Merge with master 2019-10-19 17:47:55 +02:00
DizzyEggg
4bbbbdc50a Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-10-19 15:30:14 +02:00
DizzyEggg
1d10d44a4d Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2019-10-19 15:17:45 +02:00
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
GriffinR
2c062dc764 More trade documentation 2019-10-09 05:56:44 -04:00
DizzyEggg
4c462a726e Merge with master and learnsets 2019-10-06 15:57:33 +02:00
DizzyEggg
cb6bafcb7f Merge with master 2019-10-06 14:40:12 +02:00
PikalaxALT
7b8b5b5c8c Merge branch 'master' into gflib 2019-09-27 09:11:22 -04:00
GriffinR
1016b23918
Merge branch 'master' into rename-tablecmds 2019-09-26 15:02:38 -04:00
GriffinR
b46c4b6703 more constant usage 2019-09-16 19:21:23 -05:00
PikalaxALT
306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
PikalaxALT
1e1a4076f0
Merge pull request #798 from GriffinRichards/constants-baction 
Use misc battle constants
 2019-09-05 09:06:31 -04:00
GriffinR
4a0cad80b0
Use B_SIDE constants 
Also includes a CHAR_X constant use for X items
 2019-09-04 17:06:59 -04:00
GriffinR
5f457dd459
Use B_ACTION constants 2019-09-03 15:08:25 -04:00
GriffinR
5d30304f4e Use OTID constants for CreateMon 2019-08-30 22:13:14 -05:00
DizzyEggg
f979987c2f Fix Intimidate and Trace on new switch in system 2019-08-30 12:25:21 +02:00
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