Commit Graph

7052 Commits

Author SHA1 Message Date
Evan
9472bc894f formatting 2020-11-20 08:26:50 -07:00
ExpoSeed
914c830616 Remove Techno Blast and Judgment from battle scripts 2020-11-19 21:21:34 -06:00
Evan
ef43596a79 toggleable manual ability popup destruction 2020-11-19 15:16:27 -07:00
Evan
56c0a39206 fix pressure typo 2020-11-19 11:53:47 -07:00
Evan
07a4400d50 finish switch in ability messages 2020-11-19 11:42:00 -07:00
Evan
1c398c3d4b totem format fixes 2020-11-19 10:37:15 -07:00
Evan
99d9a36860 add totem boosts 2020-11-19 10:35:37 -07:00
GriffinR
c0e3c71673
Merge pull request #1252 from luckytyphlosion/master
Missing inc files in asm/*.s and data/*.s will raise an actual error message.
2020-11-18 22:10:33 -05:00
luckytyphlosion
70b6e05a47 Remove useless comment. 2020-11-18 21:31:04 -05:00
luckytyphlosion
68b53c7437 Optimize Makefile, also add *.sna to gitignore. 2020-11-18 20:53:42 -05: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
ExpoSeed
7dcc7dae23
Merge pull request #1239 from ghoulslash/battle_anims
redo power trick anim
2020-11-17 16:36:45 -06:00
Evan
479f6be51a redo power trick anim 2020-11-17 15:31:18 -07:00
GriffinR
0aa06c307b
Merge pull request #1251 from ExpoSeed/patch-1
Document bugged IV inheritance difference
2020-11-17 14:25:36 -05:00
GriffinR
116fbecbe4
Merge pull request #1254 from kageru/pret
Use more constants in Battle Tower code
2020-11-17 13:49:58 -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
kageru
6f91f7e0e3
Use more constants in Battle Tower code 2020-11-17 17:40:26 +01:00
Aaron B-D
151aca8365 Changed how scripted wild encounters work to include double battles
Removed the old commands for scripted wild double encounters
2020-11-17 03:13:00 -05:00
ultima-soul
06e3097d44
Merge pull request #1234 from LOuroboros/guts
Implemented Guts' missing effect
2020-11-16 20:24:35 -08:00
ghoulslash
985b0874c9
Merge pull request #1236 from AsparagusEduardo/BE-FixMinior
Fixed UndoFormChange bug at the end of battles
2020-11-16 21:18:10 -07:00
Eduardo Quezada D'Ottone
27166a7147 Fixed UndoFormChange bug at the end of battles 2020-11-16 20:56:11 -03:00
ultima-soul
63bd0ec836 Remove Cacophony and fix some Gen 8 ability descriptions to fit. 2020-11-16 15:42:09 -08:00
LOuroboros
9c6a5f1ab6 Implemented Guts' missing effect 2020-11-16 20:22:59 -03: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
GriffinR
de153a67cf
Merge pull request #1253 from LOuroboros/patch-1
sanityIsBagEgg -> sanityIsBadEgg
2020-11-16 14:57:16 -05:00
LOuroboros
cad5b57b42
sanityIsBagEgg -> sanityIsBadEgg
Fixed a typo.

Lunos#4026
2020-11-16 15:36:38 -03:00
ExpoSeed
e5f043ff72
Fix grammar 2020-11-15 16:28:09 -06:00
ExpoSeed
3f157b5293
Document bugged IV inheritance difference 2020-11-15 16:24:19 -06:00
Eduardo Quezada D'Ottone
fb8a6b408f
Merge pull request #1224 from AsparagusEduardo/BE-PECompat
Fixed compatibility with Pokémon Expansion
2020-11-15 14:16:26 -03: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
luckytyphlosion
5029c90979 Missing inc files in asm/*.s and data/*.s will raise an actual error message. 2020-11-12 11:04:38 -05: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
98d3427e62
Prevent Ability Popup overwrites #1218 from ghoulslash 2020-11-10 17:34:33 -03: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
ExpoSeed
429df3c319
Merge pull request #571 from LOuroboros/new_surf_pal
Added functionality to the B_NEW_SURF_PARTICLE_PALETTE anim. config label
2020-11-10 11:37:07 -06:00
ExpoSeed
17f7af747c
Merge pull request #569 from LOuroboros/anim_settings_label_fixes
Fixed anim. settings labels in src/battle_anim.c
2020-11-10 11:36:27 -06:00
ghoulslash
6b6750028a
Merge pull request #1216 from LOuroboros/intimidate
Tweaked Intimidate a little
2020-11-10 10:34:36 -07:00
LOuroboros
bb4f00737e B_EXPANDED_INTIMIDATE->B_UPDATED_INTIMIDATE 2020-11-10 14:26:47 -03:00
Evan
0683dc9c3f longer ability popup delay to prevent overwriting 2020-11-10 10:05:11 -07: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