ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-06 09:33:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,612 Commits 1 Branch 0 Tags 235 MiB
921b80de7c
Commit Graph

3187 Commits

Author SHA1 Message Date
Evan
f428e5e2dc some quick claw/custap berry fixes 2021-01-31 23:31:27 -07:00
GriffinR
12af03cd62 Label bard music pitch table 2021-01-28 16:36:56 -05:00
GriffinR
89b85a49ec Index gBardSounds_Moves and gBardSounds_Pokemon with constants 2021-01-28 15:55:33 -05:00
GriffinR
92bd6400b7 Fix up berry sparkle 2021-01-26 05:40:34 -05:00
GriffinR
9e59581220 Document object lock and some trainer approach 2021-01-26 04:42:18 -05:00
GriffinR
0064333e4a Clean up scrcmd.c 2021-01-26 02:16:26 -05:00
GriffinR
3fd5e143a9 Misc battle anim documentation 2021-01-23 00:40:46 -05: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
5aff5333dc fix B_MEMENTO_FAIL comment 2021-01-21 12:05:01 -07:00
Evan
bfb7333507 memento gen4 failing 2021-01-21 12:03:30 -07:00
GriffinR
8fe4d004e3
Merge pull request #1305 from GriffinRichards/doc-battletv 
Document battle tv data
 2021-01-21 12:27:14 -05:00
Evan
4611c71bd1 merge with be 2021-01-21 08:55:14 -07:00
Evan
8ec12c665c merge with be 2021-01-20 17:36:13 -07:00
GriffinR
3ceb43177d
Merge pull request #1312 from sphericalice/pokeemerald 
Fix misnamed ground effect flags & document reflections
 2021-01-20 18:50:31 -05:00
ghoulslash
71f18bfbf4
Merge pull request #1316 from ultima-soul/form_species_tables_be 
Add Form Species ID Tables
 2021-01-20 13:54:39 -07:00
ultima-soul
d3b0e98325 Merge branch 'form_species_tables' into form_species_tables_be 2021-01-20 11:40:48 -08:00
ultima-soul
267900bdcb Add Form Species ID tables and functions to access them. 2021-01-20 11:31:20 -08:00
SphericalIce
4334f7a379 Include NUM_REFLECTION_TYPES in the ReflectionTypes enum 2021-01-20 10:17:07 +00:00
ExpoSeed
61db82e64a
Revert "Included global.h into battle_config.h" 2021-01-19 22:55:08 -06:00
GriffinR
6999b237eb
Merge pull request #1309 from GriffinRichards/misc-macro 
Use constants for item data, misc other constants/fixes
 2021-01-19 20:49:58 -05:00
SphericalIce
2746fd1f95 Name object event ID arguments properly 2021-01-19 23:35:57 +00:00
SphericalIce
6dd973012b Correct ground effect flag names for reflections & document sprite data usage 2021-01-19 23:21:50 +00:00
ghoulslash
9d9da6a485
Update include/constants/battle_config.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-01-19 15:01:51 -07:00
Evan
b576eb5247 fix var_terrain default, wording 2021-01-19 13:26:36 -07:00
GriffinR
752982552e Add FIRST_BALL, some FIRST_BERRY_INDEX usage 2021-01-19 13:39:18 -05:00
SphericalIce
2dfaba9472 Name color return values more accurately 2021-01-19 17:59:36 +00:00
GriffinR
305ebdbc4a Parentheses for GET_UNOWN_LETTER 2021-01-19 12:36:36 -05:00
SphericalIce
8de76ed533 Make broader use of RGB macros 2021-01-19 17:15:12 +00:00
GriffinR
cf9f8d01c5 Add misc item data constants 2021-01-19 05:49:20 -05:00
GriffinR
bc20fda604 Use GET_UNOWN_LETTER macro 2021-01-19 04:03:16 -05:00
LOuroboros
77d714ead5 Included global.h into battle_config.h 
Fixes the dupplicated defines issue.
 2021-01-16 20:37:34 -03:00
Evan
544d598506 update tailwind timer 2021-01-15 18:34:47 -07:00
Evan
f1d89b2d79 merge with be 2021-01-15 11:17:45 -07:00
ExpoSeed
b166e9a5e3
Merge pull request #1276 from LOuroboros/x_items_BE 
Reworked the effects of the X Items #1
 2021-01-15 12:05:07 -06:00
GriffinR
2da0c3436e Make filler in PokemonSubstruct0 explicit 2021-01-15 00:14:46 -05:00
GriffinR
564278fd49 Document battle tv data 2021-01-14 06:29:59 -05:00
Evan
d571c8b028 B_TERRAIN_BG_CHANGE TRUE by default 2021-01-13 16:02:32 -07:00
Evan
d26605c9fe fix bad bg fade if no permanent terrain 2021-01-13 16:01:47 -07:00
Evan
9902f6e603 merge with be 2021-01-13 14:32:14 -07:00
GriffinR
b9e1b050e1 Label remaining battle types 2021-01-13 15:20:29 -05:00
ghoulslash
fba17a96a4
Merge pull request #1253 from surskitty/battle_engine 
Increase readability of too-long names
 2021-01-12 09:20:53 -07:00
GriffinR
92de664f79 List battle animation indexes alongside tables 2021-01-11 16:07:16 -05:00
surskitty
29343ce1ec
Remove synonyms 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-01-11 15:00:11 -05:00
opakedragon
cbaf9b38b2
rename string id to reflect usage 2021-01-11 08:48:00 -05:00
surskitty
f58539b602 Renaming the last two and fixing the merge conflict with PE. 2021-01-10 15:48:57 -05:00
surskitty
a0f1dcb9cf Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2021-01-10 15:40:21 -05:00
Evan
1e22ae4cf2 merge with be 2021-01-10 09:08:25 -07:00
Evan
d4e4405cf5 merge with be 2021-01-10 09:04:21 -07:00
LOuroboros
3ffa7f993a Renamed some X Defend labels to reflect its new name in the IE 2021-01-10 01:58:02 -03:00
ultima-soul
b5b4efdaa0
Merge pull request #1314 from LOuroboros/battle_debug_constant 
battle_config.h tweaks
 2021-01-09 12:36:37 -08: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
LOuroboros
8511ed57e4 Tweaked Steam Engine's battle string 2021-01-07 18:13:16 -03:00
ghoulslash
c392a2011e
Merge pull request #1325 from ExpoSeed/BE/sync 
Sync battle engine
 2021-01-07 12:13:26 -07:00
LOuroboros
3d124944b3 Review correction to B_X_ITEMS_BUFF's comment 2021-01-07 16:09:23 -03:00
LOuroboros
cb22cbd3f6 Tweaked preprocessor constant in include/constants/item_effects.h 2021-01-07 16:06:55 -03:00
Evan
aac3f9c3db kee, maranga, sitrus beries 2021-01-06 13:07:18 -07:00
Evan
c3615485f3 merge in berry branch 2021-01-06 12:54:02 -07:00
Evan
7646855e79 jaboca, rowap berry effects 2021-01-06 11:15:56 -07:00
Evan
efa4fe89ad micle berry 2021-01-06 10:47:07 -07:00
Evan
f2e486eb0d custap berry effect, custap/quick claw activation message 2021-01-06 09:37:31 -07:00
Evan
b3a6df8d57 stat raising berries 2021-01-05 22:13:32 -07:00
Evan
4c1e8f2f2e add curious medicine 2021-01-05 20:02:11 -07:00
Evan
0a3908ee92 add neigh and as one abilities 2021-01-05 19:37:23 -07:00
GriffinR
e0c0143f41 Fix substitute back sprite 2021-01-04 10:14:01 -05:00
LOuroboros
adf039fe12 Made BufferStatRoseMessage print an extra string if B_X_ITEMS_BUFF == GEN_7 
Also turned sText_StatSharply into gText_StatSharply.
 2021-01-04 07:41:56 -03:00
LOuroboros
dbc3690282 Tweaked preprocessor directives 
Changed #ifdef X_ITEMS_REWORK == FALSE to #ifndef ITEM_EXPANSION
Changed #ifdef X_ITEMS_REWORK == TRUE to #ifdef ITEM_EXPANSION
 2021-01-04 03:58:31 -03:00
LOuroboros
517c8ffdd0 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities_BE 2021-01-03 22:05:14 -03:00
ExpoSeed
7dadcb94b8 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-03 17:14:43 -06:00
BuffelSaft
10cf5b3673 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into Batte_Engine_Only 2021-01-04 10:55:30 +13:00
GriffinR
d992e4277e
Merge pull request #1283 from GriffinRichards/doc-factscreen 
Document battle factory screen
 2021-01-03 02:51:59 -05:00
GriffinR
f2ce06683d
Merge pull request #1285 from GriffinRichards/doc-fieldscr 
Minor field_screen_effect / field_player_avatar documentation
 2021-01-03 01:59:36 -05:00
GriffinR
88e951bfe3 Label some ReturnToField funcs 2021-01-01 17:11:06 -05:00
GriffinR
c711a2f73b Document warp spin functions 2021-01-01 17:11:02 -05:00
Evan
f172245ad6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into totem 2021-01-01 08:49:43 -07:00
ExpoSeed
24362e8bed
Merge pull request #1250 from ghoulslash/infestation 
infestation between turn anim
 2020-12-31 18:06:13 -06:00
surskitty
aa9796a6ae Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip. 2020-12-31 18:57:36 -05:00
GriffinR
ec85c01e7c
Merge branch 'master' into doc-factscreen 2020-12-31 00:40:45 -05:00
GriffinR
0bf49198f6 Resume factory screen doc 2020-12-30 13:28:15 -05:00
GriffinR
2f426e0e7d Index battle controller cmd tables 2020-12-29 17:21:58 -05:00
GriffinR
769ddf22c2 Label remaining subs in battle_tower.c 2020-12-24 16:18:47 -05:00
Evan
59813c9ce7 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be_config 2020-12-23 10:27:54 -07:00
ghoulslash
450ac70ab2
Merge pull request #1288 from LOuroboros/comments 
Some more small battle_config.h tweaks
 2020-12-23 10:27:09 -07:00
LOuroboros
320cc37ac9 USE_BATTLE_DEBUG -> B_ENABLE_DEBUG 2020-12-23 14:04:14 -03:00
LOuroboros
b3c5613ff7 battle_config.h tweaks 
-Moved the USE_BATTLE_DEBUG constant from include/battle_debug.h
-Slight correction to a few comments in battle_config.h
 2020-12-23 13:16:01 -03:00
ghoulslash
0af8cab87e
Merge pull request #1283 from LOuroboros/ct_moves_data 
Added the data of SwSh's Crown Tundra's moves
 2020-12-21 23:13:23 -07:00
LOuroboros
a417a1b2b9 Corrected Punk Rock's checks 2020-12-19 16:18:39 -03:00
GriffinR
15c2856b24
Merge pull request #1265 from Kurausukun/berry_crush 
fakematch fixes, begin documenting Berry Crush (based on #1187)
 2020-12-14 23:22:41 -05:00
GriffinR
c611421882
Merge pull request #1267 from ipatix/m4a_names 
refactor m4a.c/m4a_1.s constant/variable/type naming
 2020-12-14 20:03:53 -05:00
GriffinR
18a5feb413
Merge pull request #1269 from GriffinRichards/bugfix 
Use BUGFIX for some inline fixes
 2020-12-14 20:00:59 -05:00
Evan
b85dacce9d fix conflicts 2020-12-14 08:50:41 -07:00
Evan
67fefd0261 var terrain, surge fixes 2020-12-13 19:42:48 -07:00
Evan
97172fc5b5 merge with be 2020-12-13 17:21:22 -07:00
Evan
ead8637e4f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation 2020-12-13 17:09:04 -07:00
GriffinR
f7a729df30 BUGFIX implies UBFIX 2020-12-13 16:16:48 -05:00
Tim Gates
581306db7b
docs: fix simple typo, redunant -> redundant 
There is a small typo in include/constants/battle_frontier.h.

Should read `redundant` rather than `redunant`.
 2020-12-13 22:14:50 +11:00
GriffinR
81d95b9325 Use BUGFIX for some inline fixes 2020-12-12 23:30:51 -05:00
Eduardo Quezada D'Ottone
47d96aed3c
Merge pull request #1285 from LOuroboros/spite 
Updated Spite
 2020-12-12 22:27:26 -03:00
Eduardo Quezada D'Ottone
db9933ce67
Merge pull request #1244 from ghoulslash/popup 
toggleable manual ability popup destruction
 2020-12-12 20:36:55 -03:00
LOuroboros
55bc2b4bb9 Corrected small inconsistency in move flag names 2020-12-12 12:18:56 -03:00
LOuroboros
31d483ef44 Some more battle_config.h tweaks 2020-12-12 11:35:05 -03:00
Michael Panzlaff
91ccf9e343 fix typo 2020-12-12 13:07:56 +01:00
LOuroboros
c5e04cf243 Removed the unnecessary Dragon Energy effect 
The move is an Eruption clone, whose effect was already done. Thanks to BuffelSaft for the heads up.
I took the chance and fixed its target too.
 2020-12-12 01:35:54 -03:00
LOuroboros
33d7f22494 Improved the comment of B_STANCE_CHANGE_FAIL 2020-12-11 21:54:17 -03:00
LOuroboros
17a9555715 Oopsie. 2020-12-11 21:43:18 -03:00
LOuroboros
9ec2e44f4c Updated Spite 2020-12-11 21:36:59 -03:00
LOuroboros
0ac026e6ca Added the data of SwSh's Crown Tundra's moves 
And Dragon Energy's effect. Eerie Spell's is the only one missing out of this bunch.
 2020-12-11 20:49:23 -03:00
LOuroboros
c930a63c84 Implemented Punk Rock 2020-12-11 19:46:33 -03:00
LOuroboros
2b0702ec04 Implemented Perish Body 
Inspired by Raguzero's implementation.
 2020-12-11 19:44:32 -03:00
LOuroboros
7d8b8083e8 Implemented Sand Spit 2020-12-11 16:47:23 -03:00
Michael Panzlaff
f177c736fc more CgbSound decipher work 2020-12-11 16:33:58 +01:00
Michael Panzlaff
15ff55eee5 use better m4a variable/constant names 2020-12-11 16:33:55 +01:00
Kurausukun
58976ebaa8 Merge remote-tracking branch 'upstream/master' into berry_crush 2020-12-10 23:30:52 -05:00
LOuroboros
322918e280 Implemented Steam Engine 
And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.
 2020-12-10 18:27:35 -03:00
LOuroboros
791d561f14 Reworked the effects of the X Items 
Thanks to Karathan's indications.
 2020-12-08 18:24:42 -03:00
GriffinR
f95192ed87 Define terminal species IDs relatively 2020-12-08 00:45:05 -05:00
BuffelSaft
72b769ec75 Add config options for Jump Kick 
Added options for:
- Gen 4 style recoil when target is immune (user takes 50% of target's max HP)
- Gen 3 style recoil when target is immune (i.e no recoil)
- Gen 5+ recoil was already implemented but was bugged
 2020-12-07 19:30:31 +13:00
Evan
426ea191ad style fix 2020-12-05 21:04:12 -07:00
Evan
d5ad14c349 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into popup 2020-12-05 21:03:20 -07:00
Evan
21cab1b7a7 better negative totem boost system, totems occur before switch in abilities 2020-12-05 21:00:51 -07:00
LOuroboros
6a0fee9c56 Fixed Intrepid Sword and Dauntless Shield 
And also introduced a new BattleString for BattleScript_BattlerAbilityStatRaiseOnSwitchIn
 2020-12-05 14:03:13 -03:00
LOuroboros
002973d373 Renamed BattleScript_TargetAbilityStatRaiseOnSwitchIn 
This battlescript is meant to be called within the case ABILITYEFFECT_ON_SWITCHIN of AbilityBattleEffects, which refers to the currently selected battler as Battler instead of Attacker or Target.
 2020-12-05 13:50:47 -03:00
LOuroboros
e2f4ca27b0 BattleScript_TargetAbilityStatRaiseOnSwitchin -> BattleScript_TargetAbilityStatRaiseOnSwitchIn 2020-12-05 02:43:29 -03:00
LOuroboros
9e1d7cc827 Implemented Ball Fetch 2020-12-02 23:09:35 -03:00
LOuroboros
0c4c6fc778 Implemented Cotton Down 2020-12-02 22:53:00 -03:00
LOuroboros
e11fa09632 Implemented Intrepid Sword and Dauntless Shield and... 
-Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd
-Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin

Their labels reflect the instances of a battle in which they can be called.
 2020-12-02 19:07:08 -03:00
Evan
dcefaf2563 anim particle changes false by default 2020-12-01 18:01:02 -05:00
Evan
4ad5e368a9 fix merge conflicts 2020-12-01 17:57:57 -05:00
Evan
1e68c46890 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation 2020-12-01 17:51:38 -05:00
Evan
5478179464 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_anims 2020-12-01 17:46:26 -05:00
ExpoSeed
aa7facf57b
Merge pull request #1243 from ghoulslash/abilities 
Finish Switch In Ability Activation Messages
 2020-11-28 20:27:32 -06:00
Eduardo Quezada D'Ottone
7aa999af59
Merge pull request #1235 from ultima-soul/ability_expansion 
Expand Ability IDs to u16, Add SWSH Ability Data, and Remove Cacophony
 2020-11-28 14:56:01 -03:00
Evan
7c6e74ab69 update terrain bg config option comment 2020-11-24 21:17:31 -05:00
Evan
6c0878b5fe infestation between turn anim 2020-11-24 17:21:59 -05:00
GriffinR
9d056e8656 Move object event pal declarations to graphics 2020-11-23 14:45:16 -05:00
GriffinR
513c7c5f45 Clarify Kecleon objects 2020-11-23 14:42:47 -05:00
GriffinR
bf65c1fb25 Name object event pals/tags 2020-11-23 14:24:48 -05:00
Evan
ef43596a79 toggleable manual ability popup destruction 2020-11-19 15:16:27 -07:00
Evan
07a4400d50 finish switch in ability messages 2020-11-19 11:42:00 -07:00
Evan
99d9a36860 add totem boosts 2020-11-19 10:35:37 -07:00
ultima-soul
fdfe330330
Merge pull request #519 from Pyredrid/doublescriptedwilds 
Added commands for scripted double wild battles
 2020-11-18 08:57:19 -08:00
Evan
5c658c6950 config option for terrain bg change 2020-11-17 20:26:09 -07:00
Evan
c026f705b3 permanent terrain move bgs 2020-11-17 19:45:27 -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
kageru
6f91f7e0e3
Use more constants in Battle Tower code 2020-11-17 17:40:26 +01:00
ultima-soul
63bd0ec836 Remove Cacophony and fix some Gen 8 ability descriptions to fit. 2020-11-16 15:42:09 -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
Eduardo Quezada D'Ottone
4da357aef4 Fixed compatibility with Pokémon Expansion 2020-11-15 13:35:02 -03:00
ghoulslash
686ff59b11
Merge pull request #13 from AsparagusEduardo/PR-LGPE_IOA_Moves 
LGPE & Isle of Armor move data.
 2020-11-15 08:29:10 -07:00
Eduardo Quezada D'Ottone
f0154028ff Review changes 2 2020-11-14 09:01:43 -03:00
Eduardo Quezada D'Ottone
e87f0f1ddb Review changes 2020-11-13 14:51:50 -03:00
ultima-soul
236d7145ae
Merge pull request #1220 from AsparagusEduardo/BE-SteelResistances 
Added config option for Steel type resistances.
 2020-11-12 23:25:21 -08: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
4b9d0d8e24 Added config option for Steel type resistances. 2020-11-11 17:48:02 -03:00
ExpoSeed
0912577ea1
Merge pull request #575 from AsparagusEduardo/BE-WishMegaEvo 
Implemented Wish Mega Evolution
 2020-11-11 11:05:06 -06:00
Eduardo Quezada D'Ottone
e021a4aa87
Critical Capture Config Option And Catching Charm #556 from ghoulslash 
Critical Capture Config Option And Catching Charm
 2020-11-10 17:31:08 -03: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
LOuroboros
bb4f00737e B_EXPANDED_INTIMIDATE->B_UPDATED_INTIMIDATE 2020-11-10 14:26:47 -03:00
Evan
de0518121e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2020-11-10 09:00:30 -07:00
LOuroboros
a25190f357 A few things. 
-Introduced a Gen. 8 styled text string for Intimidate
-Added an ability popup to BattleScript_IntimidatePrevented
 2020-11-10 10:34:51 -03:00
LOuroboros
e179b9b5fe Updated Intimidate to Gen. 8 standard 2020-11-10 10:18:16 -03:00
Eduardo Quezada D'Ottone
33ed87e2cb Capitalization 2020-11-09 14:52:18 -03:00
Eduardo Quezada D'Ottone
3a984136e7 Updated comment. 2020-11-09 14:50:18 -03:00
Eduardo Quezada D'Ottone
df4d927e31 Moved BATTLE_ENGINE define to global.h to fix reading from other branches 2020-11-09 12:45:31 -03:00
Eduardo Quezada D'Ottone
ddb6142709 Review changes 3. 2020-11-08 21:08:58 -03:00
Eduardo Quezada D'Ottone
35d5324324 Review changes. 2020-11-08 21:02:34 -03:00
Evan
03f480fa17 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2020-11-08 15:21:48 -07:00
Evan
980f208b78 use NATIONAL_DEX_COUNT for critical capture odds 2020-11-08 14:07:43 -07: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
MCboy
e31158d017 add spaces around - and remove comment from include in battle.h 2020-11-06 23:29:52 +03:30
MCboy
3b91735e63 use constants for ball throw count 2020-11-06 22:59:46 +03:30
Evan
b3d1e8b5b8 turn crit capture odds into a ratio 2020-11-03 08:57:11 -07:00
PikalaxALT
99dd461bef
Merge pull request #1189 from aaaaaa123456789/reverts 
Undo PokeCodec's PRs and port changes
 2020-11-03 09:28:45 -05:00
Kurausukun
6545745e59 Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts 2020-11-02 18:43:40 -05:00
Kurausukun
8bf401c227 address comments 2020-11-02 18:43:11 -05:00
Evan
e7372e7c5b add B_ prefix to critical capture configs 2020-11-01 21:50:34 -07:00
Evan
59692e8e7f styling fix 2020-11-01 21:08:58 -07:00
Evan
a6c3d950f6 critical capture config option and catching charm 2020-11-01 16:15:42 -07:00
Eduardo Quezada D'Ottone
5a201f006f
More exp options in battle_config (#530) from MandL27 2020-11-01 19:41:29 -03:00
ExpoSeed
1b65e1a1f0
Merge pull request #520 from ghoulslash/battle_engine 
Add Toggle Healthbox Visibility Feature
 2020-10-31 23:07:39 -05:00
GriffinR
be1685c87f Use constants for menu info icon table 2020-10-29 16:34:33 -04: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
Kurausukun
83846b913a port sub_806F160 fakematch fix 2020-10-26 00:01:53 -04:00
Eduardo Quezada
ae60ae8a2d Review changes. 2020-10-24 03:07:45 -03:00
Eduardo Quezada
b5834b617d Merge branch 'BattleEngine' into PR-LGPE_IOA_Moves 
# Conflicts:
#	src/data/text/move_descriptions.h
 2020-10-24 00:36:29 -03:00
Kurausukun
44c2d15ca9 re-match sub_81C79BC (from #1177) 
also re-define RBG macros
 2020-10-23 22:07:30 -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
90211248af re-match Cmd_unknown_24 (from #1140) 
changes to data structs are necessary. other things that look
unnecessary, like the order of operands, are also necessary. fuck this
function.
 2020-10-23 20:47:10 -04:00
ExpoSeed
34729ce99c
Merge pull request #150 from AsparagusEduardo/PR-MoreBattleConfigs 
More Battle Config options
 2020-10-23 10:59:12 -05:00
MandL27
6d5547bdb4 fix indentation 2020-10-21 16:20:49 -04:00
MandL27
efdaa25640 Add B_SCALED_EXP and B_SPLIT_EXP 2020-10-21 16:19:07 -04:00
LOuroboros
682d29b088 Removed the static variable from the ShouldGetStatBadgeBoost function 2020-10-21 15:30:20 -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