BuffelSaft
6a119c5a30
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2022-02-13 21:06:15 +13:00
ghoulslash
209279c207
fix psycho shift string printing
2022-02-09 14:30:30 -05:00
BuffelSaft
0a27b575dc
Fix merge error in battle scripts
2022-01-27 17:24:11 +13:00
BuffelSaft
9d1800f53e
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2022-01-27 17:18:51 +13:00
Eduardo Quezada D'Ottone
6aabe58649
Merge branch 'battle_engine' into magician
2022-01-15 13:06:13 -03:00
LOuroboros
69f678b3fc
Put the new B_WAIT_TIME_SHORTEST to use
2022-01-11 20:21:12 -03:00
LOuroboros
b2965e5522
Added a pause to BattleScript_ProteanActivates
2022-01-11 20:15:47 -03:00
Eduardo Quezada D'Ottone
97baedbd5e
Merge pull request #1923 from WiserVisor/battle_engine
...
Added Sky Drop to Battle Engine
2022-01-07 18:14:40 -03:00
Eduardo Quezada D'Ottone
5b54986e6b
Merge pull request #1980 from LOuroboros/multiBattles
...
Multi battle updates
2021-12-29 22:09:06 -03:00
Eduardo Quezada D'Ottone
4d6f54e8d6
Merge pull request #2007 from ghoulslash/be/roleplay
...
Update Role Play
2021-12-25 11:37:57 -03:00
ghoulslash
93a7e139ec
merge w be
2021-12-24 09:40:12 -05:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine
2021-12-23 15:29:10 -08:00
ghoulslash
b6b5d862f4
update role play mechanics
2021-12-23 08:37:11 -05:00
LOuroboros
ffe35fbb06
Updated defeat condition on multi battles
2021-12-19 08:30:43 -03:00
ghoulslash
31bbc4ddde
prevent stat-raising damage effects if battle will end
2021-12-17 10:24:07 -05:00
ultima-soul
a5afdac0ae
Resolved review suggestions for upstream Battle Engine sync.
2021-12-08 12:08:16 -08:00
ghoulslash
1e644c9d4c
fix spacing
2021-12-05 14:45:48 -05:00
ghoulslash
c0e408bfab
fix aqua ring heal anim
2021-12-05 14:44:22 -05:00
ultima-soul
7369f60c06
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
2021-12-03 17:30:45 -08:00
ultima-soul
23bf41713c
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-12-01 20:17:08 -08:00
ultima-soul
0312c5be8b
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-27 21:38:26 -08:00
BuffelSaft
fd4414fe62
Spaces instead of tabs
2021-11-23 23:01:43 +13:00
BuffelSaft
a89ce0c38a
Swapped webs don't trigger Defiant
...
Track the side that originally set Sticky Web, and if it matches the side the target of the speed drop is on, don't activate Defiant. Hard to tell if this is a bug or a feature in gen 8 - maybe the swapped webs are considered a "friendly" effect?
Also, fix Sticky Web not activating Defiant.
2021-11-23 22:54:30 +13:00
GriffinR
e0fae879da
Merge pull request #1558 from GriffinRichards/update-macros
...
Update event macro comments
2021-11-22 19:10:49 -05:00
BuffelSaft
6b8f86c276
Snap Trap placeholder anims
...
Set up animation data for Snap Trap so it can be easily replaced with a proper animation later.
2021-11-23 11:05:36 +13:00
BuffelSaft
d2eb5f0e61
Remove shell trap effect code
...
Left strings and animations as those were fine, but code was non-functional and fixing it was not trivial.
2021-11-22 14:46:47 +13:00
BuffelSaft
42b8f18cb1
Remove Corrosive Gas code
...
This was not working at all in testing, so it can be done by a separate PR later.
2021-11-22 14:35:01 +13:00
BuffelSaft
70f0018c08
Partially implement Shell Trap
...
Doesn't play the animation when the trap triggers, but kinda works? May also be incredibly buggy, but I'm not interested in working on this move any further.
2021-11-22 14:14:41 +13:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
GriffinR
23dd1dad7f
Fix incorrect palettes in Mauville flower tileset anims
2021-11-21 11:23:03 -05:00
W1serV1ser
c2f81cd5f5
Added Sky Drop
2021-11-20 11:44:48 -08:00
BuffelSaft
14a2e86313
Fix Scale Shot
...
Lowers defense and raises speed instead of just lowering defense now. Tested with Contrary and min/max speed/def.
2021-11-19 21:57:32 +13:00
BuffelSaft
86efd69370
Finish/fix Beak Blast
...
This was not working at all, but the basic framework was there; some small changes tidied it up and made it work.
2021-11-19 20:19:10 +13:00
BuffelSaft
98712e576e
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2021-11-19 17:48:11 +13:00
GriffinR
42a83ee50e
Use STR_VAR names for apprentice_buff and frontier_gettrainername
2021-11-18 23:20:05 -05:00
GriffinR
e66ea0cb99
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
GriffinR
6c6487dd7a
Missing spaces to tabs in scripts files
2021-11-18 21:02:22 -05:00
GriffinR
c89dfd9f56
Finish updating macro comments
2021-11-18 01:47:58 -05:00
GriffinR
b5b5d95de6
Distinguish 'virtual object' names from object events
2021-11-17 23:40:53 -05:00
GriffinR
c4f8f4d11a
Add STR_VAR_# ids to string buffer macros
2021-11-17 22:00:44 -05:00
GriffinR
c940b67716
Continue macro comment updating
2021-11-17 17:45:59 -05:00
GriffinR
61aa9c3ba9
More updating event macro comments
2021-11-16 17:46:34 -05:00
GriffinR
d414787932
Some TV clean-up
2021-11-16 16:22:17 -05:00
GriffinR
5d9c31a610
Label slot machine ids, fix GetPriceReduction
2021-11-16 15:43:52 -05:00
GriffinR
63c5905914
Continue updating event macro comments
2021-11-16 13:10:23 -05:00
GriffinR
04cc923d6c
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
GriffinR
65d3b58374
Add PARTY_NOTHING_CHOSEN
2021-11-15 10:57:06 -05:00
GriffinR
f85de6eca5
Start event macro comment updates
2021-11-15 10:54:57 -05:00
GriffinR
b14fe9dce3
Merge pull request #1547 from GriffinRichards/doc-sounddata
...
Clean up sound, add CRY_MODE constants
2021-11-13 15:54:40 -05:00
ghoulslash
940a165be7
merge w be
2021-11-13 09:09:15 -05:00
