Commit Graph

6854 Commits

Author SHA1 Message Date
Evan
b85dacce9d fix conflicts 2020-12-14 08:50:41 -07:00
Eduardo Quezada D'Ottone
8ffd9bfcca
Merge pull request #1271 from LOuroboros/drives_and_anims
Fixed softlock caused by the majority of Techno Blast's animations
2020-12-13 21:40:10 -03:00
LOuroboros
785e23222b Review correction 2020-12-13 21:20:27 -03: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
ea1dca3024
Merge pull request #1270 from LOuroboros/drives_and_types
Made Techno Blast's animation change depending on the Drive held
2020-12-12 21:43:45 -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
Eduardo Quezada D'Ottone
2d742dc879
Merge pull request #1286 from LOuroboros/B_STANCE_CHANGE_FAIL
Improved the comment of B_STANCE_CHANGE_FAIL
2020-12-12 16:56:24 -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
ghoulslash
38b61ac5a0
Merge pull request #1273 from ghoulslash/battle_anims
Fix Terrain BG on new battles
2020-12-08 11:28:26 -07: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
Evan
37aeeae277 fix terrain bg on subsequent battle start 2020-12-05 20:25:03 -07:00
LOuroboros
42a06c6003 Fixed softlock caused by the majority of Techno Blast's animations
And made the checks that sets its animation use the Type constants instead of their internal IDs.
2020-12-05 21:23:59 -03:00
LOuroboros
b6d0681779 Included hold_effects.h in battle_anim_new.c
Otherwise the file won't recognize HOLD_EFFECT_PLATE and will refuse to build a ROM.
2020-12-05 20:50:33 -03:00
LOuroboros
49ca76f880 Made Techno Blast's animation change depending on the Drive held 2020-12-05 20:39:05 -03:00
ultima-soul
e05b5fc8a3
Merge pull request #1260 from ghoulslash/BE_test
Fix Babydoll eyes animation
2020-12-04 15:46:17 -08:00
Eduardo Quezada D'Ottone
15a587f4e9
Merge pull request #1261 from ghoulslash/u16-abilities
Fix Buffering abilities > 255
2020-12-04 15:18:45 -03:00
ultima-soul
85d0693426
Merge pull request #1240 from ghoulslash/battle_anims
Terrain Moves Cause Permament BG Change
2020-12-03 20:04:21 -08:00
Evan
5c72a89105 fix B_BUFF_ABILITY 2020-12-02 15:03:49 -05:00
Evan
3102e499da fix babydoll eyes anim priority 2020-12-02 14:23:03 -05:00
Evan
4ad5e368a9 fix merge conflicts 2020-12-01 17:57:57 -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
9ec67db8fa keep permanent terrain bg from party menu, bag 2020-11-24 17:03:40 -05:00
Eduardo Quezada D'Ottone
47fe30f0a1
Merge pull request #1246 from ExpoSeed/BE-patch
Remove Techno Blast and Judgment from battle scripts
2020-11-20 20:49:38 -03:00
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
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
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
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