ghoulslash
9d8672e3df
merge with be
2021-09-16 13:12:59 -04:00
ghoulslash
2067f563cd
cannot block your own prankster elevated perish song
2021-09-16 11:47:05 -04:00
ghoulslash
aeafd9e222
perish song + prankster interaction
2021-09-16 11:34:01 -04:00
ghoulslash
9c94eb6140
but it failed check for rototiller
2021-09-16 10:24:32 -04:00
ghoulslash
85f3982fb9
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into prankster
2021-09-15 17:52:45 -04:00
ghoulslash
845e333ba1
fix electric/misty terrain interactions with yawn/rest failures
2021-09-15 17:11:42 -04:00
ghoulslash
aa475ab300
merge with be
2021-09-15 16:42:23 -04:00
ghoulslash
0bca01cb74
mental herb fixes
2021-09-15 12:56:58 -04:00
ghoulslash
b85586a33a
merge with be
2021-09-15 12:54:39 -04:00
ghoulslash
60713a8f2d
fix room service activation msg, stat target
2021-09-14 12:50:36 -04:00
ghoulslash
95af97593b
fix some comment styling. fix throat spray for multi-target moves
2021-09-14 11:53:35 -04:00
ghoulslash
f3f26d1a6f
merge with be
2021-09-13 19:40:28 -04:00
BuffelSaft
7d3980de58
Fix multihit moves vs damage reducing berries
...
The extra waitmessage command is ugly but appears to be needed - if it's moved before the printstring, the message isn't displayed long enough on single hit moves.
2021-09-12 18:33:04 +12:00
ghoulslash
0cd7f3ffcd
Merge pull request #1635 from rh-hideout/DizzyEggg-galvanize_explosion
...
fix galvanize explosion + lightning rod
2021-09-09 12:04:42 -06:00
ghoulslash
9d3f906fda
Merge pull request #1537 from DizzyEggg/intimidate_popup
...
Fix lag caused by ability pop-up while it's set to False
2021-09-09 09:34:50 -06:00
ghoulslash
b8a71cabd1
merge with be
2021-09-09 09:44:18 -04:00
DizzyEggg
decf65a025
Merge pull request #1580 from ghoulslash/water_bubble
...
Water Bubble Prevents Burn
2021-09-08 20:00:45 +02:00
DizzyEggg
6a8f55dabf
fix galvanice explosion
2021-09-08 12:38:46 +02:00
BuffelSaft
a4b630e6b5
Fix MOVE_EFFECT_REMOVE_STATUS
...
Wake-Up Slap and Sparkling Aria now print the correct message when the target is cured.
Also, fix Ice Hammer's effect chance.
2021-09-07 16:34:32 +12:00
ghoulslash
e93ad2e255
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into water_bubble
2021-09-06 09:24:28 -04:00
ghoulslash
949c4ef63b
add ability popup
2021-09-06 09:24:15 -04:00
DizzyEggg
cdec3077b2
Merge pull request #1630 from BuffelSaft/disguise2
...
Fix many Disguise bugs
2021-09-06 10:32:37 +02:00
BuffelSaft
bdbb4b5f7e
Fix many Disguise bugs
...
Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.
2021-09-06 18:27:42 +12:00
ghoulslash
933696b3cd
merge with be
2021-09-03 17:41:00 -04:00
ghoulslash
79f39a1fd0
fix eject button
2021-09-03 14:56:36 -04:00
ghoulslash
5c5276b04d
red card fixes
2021-09-03 14:29:28 -04:00
ghoulslash
93e2e09148
fix terrain seeds. create generic CompareStat function
2021-09-03 12:17:38 -04:00
ghoulslash
6ce1227447
fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case
2021-09-03 11:05:11 -04:00
ghoulslash
7c53214dad
merge with be
2021-09-02 15:33:42 -04:00
ultima-soul
a10a02a536
Merge pull request #1221 from ghoulslash/battle_engine
...
Implement Pickpocket
2021-09-02 11:33:34 -07:00
LOuroboros
69b7910f47
Gave an entrance animation to Delta Stream
2021-08-31 00:15:17 -03:00
LOuroboros
0a38054925
Print STRINGID_ATTACKWEAKENEDBSTRONGWINDS properly
2021-08-30 21:21:07 -03:00
LOuroboros
216d8f0608
Solved game freezing issue
...
My approach with BattleScript_AttackWeakenedByStrongWinds was incorrect and thus caused the game to freeze when Battle Scene is enabled, so I resorted to printing the string directly, which I don't like because there is no pauses between `attackstring` and `STRINGID_ATTACKWEAKENEDBSTRONGWINDS`.
2021-08-27 18:28:34 -03:00
LOuroboros
9e4f33d09e
Implemented Desolate Land, Primordial Sea and Delta Stream
2021-08-27 17:56:43 -03:00
ghoulslash
85f98300ff
use B_WAIT_TIME_SHORT and B_WAIT_TIME_LONG
2021-08-12 14:14:51 -06:00
ghoulslash
0bbbd1e7a9
fix electric/misty yawn/rest interactions
2021-08-12 14:08:41 -06:00
ghoulslash
c7c0fbc296
merge with be, make AI CanBeStatused functions separate from general util ones
2021-08-12 13:37:53 -06:00
ghoulslash
d218322b2c
merge with be
2021-08-12 01:26:13 -04:00
ultima-soul
02c9e040df
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-11 16:33:10 -07:00
LOuroboros
b4c4650186
Corrected inconsistent flag label spelling
2021-08-05 17:26:03 -03:00
GriffinR
44cd9eed6b
Add align directives to all marts
2021-08-04 11:50:33 -04:00
LOuroboros
f1195e1884
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile
2021-07-27 09:08:52 -03:00
ghoulslash
c914ed8572
fix sucker punch, surging strikes, obstruct, and snipe shot
2021-07-25 09:38:54 -06:00
ghoulslash
a37d4c3da9
merge with be, give life dew jungle healing effect
2021-07-25 08:22:05 -06:00
ghoulslash
fd61770c34
water bubble prevents burn
2021-07-25 07:53:44 -06:00
ghoulslash
72d346fa46
Merge pull request #1560 from rh-hideout/DizzyEggg-patch-3
...
Fix White Smoke affecting Shell Smash's def drop
2021-07-24 07:14:08 -06:00
GriffinR
06351bf63c
Remove address comments
2021-07-20 15:18:31 -04:00
ghoulslash
a29c9f9339
Merge pull request #1569 from LOuroboros/cotton_down
...
Fixed Cotton Down
2021-07-13 11:06:59 -06:00
ghoulslash
ebc187c16d
Merge pull request #1536 from DizzyEggg/gravity
...
Fix Gravity's animation
2021-07-13 10:54:45 -06:00
LOuroboros
02eace4574
Fixed Cotton Down
...
It will no longer affect fainted 'mons.
2021-07-13 13:54:33 -03:00
GriffinR
72bb2bd160
Merge pull request #1474 from GriffinRichards/clean-miragetower
...
Clean up Mirage Tower
2021-07-10 23:26:41 -04:00
DizzyEggg
34f869ef40
Fix White Smoke affecting Shell Smash's def drop
2021-07-06 10:37:17 +02:00
GriffinR
0f538102d9
Add local id constants for C
2021-07-05 13:54:43 -04:00
GriffinR
d2701b51ab
Combine battle script labels, add EFFECT comments
2021-07-02 15:37:59 -04:00
GriffinR
64d06f4c8f
Condense battle AI scripts, minor clean up
2021-07-02 02:46:01 -04:00
GriffinR
8f43d1ebeb
Document smart shopper TV show
2021-07-02 01:45:23 -04:00
GriffinR
10886a586b
Clean up mirage tower
2021-07-01 23:46:15 -04:00
BuffelSaft
4c18cb7fe7
Remove EFFECT_THAW_HIT
2021-06-19 11:49:00 +12:00
SphericalIce
0a94dba4a7
Rename item script labels to fit the established name scheme
2021-06-13 13:21:23 +01:00
ExpoSeed
3ed06c2cc2
Remove remaining grey and replace with gray
2021-06-10 11:36:10 -05:00
DizzyEggg
59ea75f99f
Fix Ability-popup lag
2021-06-08 12:56:38 +02:00
DizzyEggg
e2f14d43db
Fix Gravity's animation
2021-06-08 12:13:40 +02:00
LOuroboros
588b3638d3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into inner_focus
2021-06-07 19:22:20 -03:00
LOuroboros
8726107d42
Removed BattleScript_FlinchPrevention
...
Also reverted a nonsensical change in SetMoveEffect's case MOVE_EFFECT_FLINCH.
2021-06-07 19:18:15 -03:00
ultima-soul
092f02f119
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-06-07 12:00:23 -07:00
ultima-soul
6edec5bc3d
Merge pull request #1437 from LOuroboros/oblivious
...
Tweaked Oblivious
2021-06-04 16:51:38 -07:00
LOuroboros
b552db7193
Tweaked the Oblivious immunities
...
Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.
2021-06-04 19:23:07 -03:00
ultima-soul
2813b4f9bf
Merge pull request #1519 from DizzyEggg/flameburst
...
Fix FlameBurst
2021-06-03 09:30:50 -07:00
LOuroboros
b215b44951
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into clanging_scales
2021-06-03 05:09:14 -03:00
DizzyEggg
85ff866998
Fix FlameBurst
2021-06-03 09:50:43 +02:00
ultima-soul
b7f9009c1e
Merge pull request #1515 from DizzyEggg/battle_engine
...
Get rid of SOUND_PAN_ATTACKER in launchtemplate
2021-06-02 23:45:12 -07:00
LOuroboros
a60fd31b9f
Added the MOVE_EFFECT_CERTAIN arg to BattleScript_EffectAttackerDefenseDownHit
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-06-02 16:42:02 -03:00
BuffelSaft
2a6b989c92
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into body-press
2021-06-02 12:41:28 +12:00
LOuroboros
c21a00a5d1
Replaced magic numbers with constants in BattleScript_NotAffectedAbilityPopUp
2021-06-01 18:20:33 -03:00
LOuroboros
d48a6e00d4
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into oblivious
2021-06-01 18:15:01 -03:00
DizzyEggg
dd88be659c
Get rid of SOUND_PAN_ATTACKER in launchtemplate
2021-06-01 13:44:02 +02:00
DizzyEggg
72b7cb2dad
Merge pull request #1474 from LOuroboros/overdrive
...
Fixed Overdrive's animation
2021-06-01 13:33:11 +02:00
ghoulslash
c3e28e9b1a
merge with be
2021-05-23 12:22:52 -06:00
LOuroboros
9b46b6fb45
pause 0x40 -> pause B_WAIT_TIME_LONG
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-05-22 16:34:39 -03:00
LOuroboros
8cbdde3fba
waitmessage 0x40 -> waitmessage B_WAIT_TIME_LONG
2021-05-21 20:22:04 -03:00
LOuroboros
1bd451e232
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 2turn_move_tweaks
2021-05-21 20:21:51 -03:00
ExpoSeed
6a977bdbfc
Document second parameter of playbgm
2021-05-21 15:08:00 -05:00
GriffinR
c8be6a1fbb
Remove leftover berry descriptions
2021-05-17 03:06:02 -04:00
GriffinR
65fd334256
Name map groups
2021-05-11 10:16:04 -05:00
LOuroboros
95d41524a2
Implemented Clanging Scales' effect
2021-05-09 18:20:03 -03:00
Flametix
a8fab62c89
Fix Substitute typo
2021-05-06 20:49:04 -04:00
LOuroboros
64a86d0285
Swapped launchtemplate calls with createsprite calls
2021-05-04 15:36:00 -03:00
ultima-soul
e864c39a5d
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
2021-05-04 10:04:35 -07:00
ghoulslash
22fc9733e5
Merge pull request #1480 from BuffelSaft/big_root_fix
...
Make Big Root affect absorb moves
2021-05-04 09:32:18 -06:00
BuffelSaft
5d177f0a15
Make Big Root affect absorb moves
...
Big Root should increase the HP recovered by Absorb, Giga Drain etc.
2021-05-04 23:20:22 +12:00
LOuroboros
fa0d3a351e
Fixed Overdrive's animation
2021-05-02 20:10:48 -03:00
ultima-soul
56fc420187
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 21:34:30 -07:00
GriffinR
f7a699c686
Merge pull request #1421 from GriffinRichards/doc-tvrecordmix
...
Document TV
2021-04-29 00:25:01 -04: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
bc9fc38254
Misc contest cleanup
2021-04-22 15:51:04 -04:00
GriffinR
dbe24f0baa
Clean up contest_painting
2021-04-21 20:04:12 -04:00
GriffinR
09a9efd5c5
Merge pull request #1398 from GriffinRichards/doc-field
...
Document field
2021-04-10 13:05:51 -04:00
GriffinR
4a1cfbead2
Document remaining overworld
2021-04-06 16:55:43 -04:00
GriffinR
802d2b2f0f
Label Kyogre/Groudon anims
2021-04-06 03:46:19 -04:00
