LOuroboros
387bf07e3c
Update battle_scripts_1.s
2022-03-20 19:00:21 -03:00
LOuroboros
aca51e843e
Update battle_scripts_1.s
2022-03-14 16:14:32 -03:00
ultima-soul
86089ce935
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2022-02-28 22:13:14 -08:00
Eduardo Quezada D'Ottone
ed464a9e8d
Merge pull request #2068 from ghoulslash/be/strugglebug
...
Fix struggle bug anim
2022-02-25 12:50:55 -03:00
ghoulslash
7c2bbf1df3
fix struggle bug anim
2022-02-25 08:54:35 -05:00
ghoulslash
e4ef3cc3b4
move glare effectiveness exception to code
2022-02-24 22:06:18 -05:00
cbt6
f826a5a82d
Use constants for PC locations
2022-02-23 15:07:22 +08:00
GriffinR
0710a5467b
Add some missing RGB constant usage
2022-02-15 21:55:51 -05:00
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
Eduardo Quezada D'Ottone
c849197a88
Config for Minimize raising 2 stages
2022-02-13 00:45:35 -03:00
Eduardo Quezada D'Ottone
d73e6faab8
Config for Growth being affected by sunlight
2022-02-13 00:30:37 -03:00
Eduardo Quezada D'Ottone
0dd2de988a
Merge branch 'battle_engine' into primalReversionTweaks
2022-02-12 23:08:12 -03: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
GriffinR
2495d18132
Add missing :req, remove old macros
2022-01-23 18:52:04 -05:00
LOuroboros
8eaf0718ec
Review changes
...
Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.
2022-01-23 19:13:04 -03:00
LOuroboros
a8a8c7e2fa
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
2022-01-23 02:37:07 -03:00
GriffinR
a7e6045d71
Merge pull request #1597 from GriffinRichards/misc-cleanup
...
Miscellaneous fixes
2022-01-19 22:17:37 -05:00
GriffinR
69759b2d12
Merge pull request #1601 from GriffinRichards/fix-decor-flag
...
Fix FLAG_DECORATION_0 name
2022-01-16 17:44:58 -05:00
Eduardo Quezada D'Ottone
6aabe58649
Merge branch 'battle_engine' into magician
2022-01-15 13:06:13 -03:00
GriffinR
fd7457b05a
Remove berry fix
2022-01-13 15:26:20 -05:00
GriffinR
f899a02ac6
Use MON_GIVEN_TO_ constants for givemon
2022-01-12 18:34:26 -05: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
GriffinR
49418f8c01
Add missing commas
2022-01-11 09:55:11 -05:00
GriffinR
3a6c633905
Add seteventmon
2022-01-11 02:16:25 -05:00
GriffinR
110fbc559c
Make item optional for givemon and setwildbattle
2022-01-11 02:08:14 -05:00
GriffinR
8b920691e6
Fix FLAG_DECORATION_0 name
2022-01-09 01:31:42 -05: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
GriffinR
ce55e58ad8
Misc cleanup
2022-01-04 10:09:42 -05:00
GriffinR
23f5c9fd5c
Clean up pokedex_area_screen
2021-12-31 00:16:56 -05: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
e28fa7f91c
Update event_scripts.s
2021-12-21 22:10:54 -03:00
LOuroboros
ffe35fbb06
Updated defeat condition on multi battles
2021-12-19 08:30:43 -03:00
ultima-soul
b0b8b9bf46
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 23:51:29 -08:00
ultima-soul
4f2e3bf214
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 21:23:54 -08:00
ghoulslash
31bbc4ddde
prevent stat-raising damage effects if battle will end
2021-12-17 10:24:07 -05:00
ExpoSeed
65186b8c3a
Fix some style issues
2021-12-16 21:57:30 -06:00
ExpoSeed
d6747527da
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-12-16 21:44:01 -06:00
Eduardo Quezada D'Ottone
bbf7b62ceb
Config for lost money after losing a battle
2021-12-11 23:03:50 -03:00
LOuroboros
f317b542e2
Updated Teleport
2021-12-11 21:20:04 -03:00
ultima-soul
26f29a04fd
Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync"
...
This reverts commit ac2bcece75349262ebc3
2021-12-10 09:41:54 -08:00
ultima-soul
ac2bcece75
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync
2021-12-09 14:16:05 -08:00
ultima-soul
a5afdac0ae
Resolved review suggestions for upstream Battle Engine sync.
2021-12-08 12:08:16 -08:00
GriffinR
cc05b08227
Fix incorrect ever grande flower animation palettes
2021-12-06 11:17:42 -05: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
GriffinR
d501636730
Fix incorrect flag animation palettes
2021-12-03 16:36:18 -05:00
ultima-soul
d408b56549
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-12-01 20:18:57 -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
LOuroboros
2e67153982
Renamed the Enigma Berries' constants
2021-12-01 22:16:38 -03:00
LOuroboros
f2dd7bce99
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionTweaks
2021-11-30 20:39:58 -03:00
SonikkuA-DatH
adecc77fe8
Update battle_anim_scripts.s
2021-11-28 19:47:09 -08:00
SonikkuA-DatH
10a870a568
Update battle_scripts_1.s
2021-11-28 19:45:47 -08:00
ultima-soul
d0623d7b71
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-27 21:40: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
a8f9a54787
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-21 10:41:32 -08: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
BuffelSaft
16a4fc9062
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-11-19 16:33:24 +13:00
GriffinR
6c6487dd7a
Missing spaces to tabs in scripts files
2021-11-18 21:02:22 -05:00
TheXaman
2f8896f2f0
Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system
2021-11-18 15:13:04 +01: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
LOuroboros
5c485d9769
Fixed Fling when gLastUsedItem is 0
...
Also renamed VARIOUS_JUMP_IF_NO_FLING_POWER to VARIOUS_JUMP_IF_FLING_FAILS.
2021-11-15 14:02:33 -03: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
LOuroboros
a01fd2eb7a
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
2021-11-15 12:47:26 -03:00
LOuroboros
cbb6639f8d
Fling tweaks
...
-Updated and renamed VARIOUS_JUMP_IF_FLING_FAILS (now VARIOUS_JUMP_IF_NO_FLING_POWER)
-Updated BattleScript_EffectFling following Smogon's description of Fling's effect.
-Refactored BattleScript_FlingMentalHerb thanks to GetMentalHerbEffect
-No need to define flingPower when its value is 0
-Forced the target to eat a berry that was flung at them by overwriting their item with the berry thrown and restoring their original item after its effect finishes.
-Added a preproc config for Klutz.
2021-11-15 12:40:10 -03: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
ghoulslash
9df66f4ac1
Merge pull request #1843 from Blackforest92/battle_engine
...
Update Giga Impact's graphic and use fade-in battle animation.
2021-11-13 08:54:37 -05:00
LOuroboros
2fe015e5ce
Implemented Fling
2021-11-13 10:27:05 -03:00
Eduardo Quezada D'Ottone
704957efb9
Fixed Relic Song's SE
2021-11-13 07:30:12 -03:00
BuffelSaft
04867ac0d3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-11-13 17:33:25 +13:00
BuffelSaft
55b279ba0a
Fix several move effects
...
Dragon Tail, Natural Gift, Spit Up all hit twice now. Could maybe use isparentalbondlaststrike instead of some of the other checks too.
2021-11-13 16:29:12 +13:00
BuffelSaft
6232b046b1
Fix Burn Up
...
Now works properly with and without Parental Bond. It wasn't broken before, but its interaction with Parental Bond was.
2021-11-13 12:40:45 +13:00
Eduardo Quezada D'Ottone
a7870dbef0
Merge branch 'battle_engine' into magician
2021-11-12 19:40:34 -03:00
LOuroboros
ad5bcd06cf
Fixed a small buffer overflow in AI_CV_Recycle_ItemsToEncourage
2021-11-11 22:27:17 -03:00
BuffelSaft
e606e54f9d
Fix Big Pecks/Octolock animation
...
Also removed MOVE_EFFECT_AFFECTS_USER because that shouldn't be part of playstatchangeanimation. The stat drops still bypass Mirror Armor without this.
2021-11-11 14:32:38 +13:00
BuffelSaft
e637714e1b
Requested changes
...
Various bug fixes, syntax corrections etc.
2021-11-10 21:11:15 +13:00
BuffelSaft
e2599c2469
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1
2021-11-10 14:31:32 +13:00
Blackforest92
76ba9d835a
pulled latest RHH battle_engine 08-11-2021
2021-11-08 16:38:42 +07:00
GriffinR
c4169cfd29
Disambiguate cry functions
2021-11-07 14:26:09 -05:00
GriffinR
54b254a829
Add CRY_MODE constants
2021-11-07 13:33:05 -05:00
Eduardo Quezada D'Ottone
c2a17510a9
Terrain Pulse animations
2021-11-07 11:25:08 -03:00
BuffelSaft
e407883b58
Rethink final strike effects
...
This is now checked in SetMoveEffect instead of in each move that should behave this way. Some effects will need to be redone to make them play nice with this change, but some just work as is.
2021-11-07 20:31:09 +13:00
BuffelSaft
72d12a575d
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-11-07 12:13:18 +13:00
Eduardo Quezada D'Ottone
e9804a5023
Secret Power animation config
2021-11-06 17:32:34 -03:00
ghoulslash
da6ec51fc2
merge w be
2021-11-06 10:43:35 -04:00
ghoulslash
41bf1dc2f4
merge w be
2021-11-06 10:40:57 -04:00
Eduardo Quezada D'Ottone
ae8de0f07a
Merge branch 'BattleEngine' into BE_TerrainMoves
...
# Conflicts:
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
# src/battle_util.c
2021-11-06 10:44:05 -03:00
BuffelSaft
5acebe32aa
Merge pull request #1817 from LOuroboros/photonGeyser
...
Implemented Photon Geyser and Shell Side Arm
2021-11-06 16:04:53 +13:00
BuffelSaft
14ebba04af
Align comment with others
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-11-06 12:43:57 +13:00
BuffelSaft
4007a8d1f8
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into relic_song
2021-11-06 11:52:51 +13:00
LOuroboros
5f458c9cd3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-11-05 10:58:53 -03:00
BuffelSaft
ee83d1142c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1
2021-11-05 21:40:05 +13:00
BuffelSaft
bf786c6c9a
Fix Magma Storm
...
Fix the strings and animation displayed when Magma Storm. Also move gTrappingMoves to battle_script_message.c as it's only sued in this file, and this allows ARRAY_COUNT(sTrappingMoves) to replace the constant in SetMoveEffect.
2021-11-05 18:22:52 +13:00
BuffelSaft
a8d44f84a1
Merge pull request #1852 from Blackforest92/battle_engine_2
...
Update waterfall, trick room, & focus blast BG
2021-11-05 15:27:52 +13:00
BuffelSaft
6df3975fc6
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2
2021-11-05 14:32:33 +13:00
cbt6
32aaf6912f
Rename movement scripts to use Faster over Fastest
2021-11-05 02:22:28 +08:00
LOuroboros
22f7e81bef
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry
2021-11-04 12:25:26 -03:00
LOuroboros
4f251e6ec2
Moved VARIOUS_TRY_TO_REVERT_MIMICRY to VARIOUS_REMOVE_TERRAIN
2021-11-04 12:13:55 -03:00
LOuroboros
e0b53f87fc
Primal Reversion Tweaks
...
-Fixed the inconsistent Primal Reversion activation in double battles.
-Optimized the primal weather checks in attackcanceler a little.
-Fixed the issue with multi-target fire/water moves during primal rain/sun.
2021-11-04 12:04:14 -03:00
BuffelSaft
c9ae140bd1
Fix Clangourous Soul
...
I broke this while trying to tidy up the code, it worked perfectly before. Also, make sure the "recoil' doesn't break Disguise.
2021-11-04 21:50:42 +13:00
BuffelSaft
ecbe048f96
Fix Octolock
...
Fixed two issues:
- Octolock doesn't have an end of turn animation in gen 8
- The def drop anim wasn't played if Sp. Def was at -6 and def could still drop
2021-11-04 21:26:04 +13:00
BuffelSaft
cecd341011
Fix Tar Shot
...
If Tar Shot can't do anything to the target it should fail. Checking this is clunky, but it works.
2021-11-04 20:47:45 +13:00
BuffelSaft
3baf2aa331
Remove trynextdart, update waitmessage 0x40
...
Not dealing with Dragon Darts in this PR. Updated waitmessage 0x40 to waitmessage B_WAIT_TIME_LONG.
2021-11-04 20:19:18 +13:00
BuffelSaft
28e78cb6c4
Gen 8 moves initial commit
...
Full credit to Nunuchu42 and cfmnephrite for this code.
2021-11-04 19:50:54 +13:00
BuffelSaft
e930dae278
Remove ability pop up for Hunger Switch
...
Morpeko should change form each turn without showing its ability.
2021-11-04 15:40:26 +13:00
BuffelSaft
616be576fc
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2
2021-11-04 15:29:38 +13:00
LOuroboros
b931e34172
Handled Mimicry's interaction with Steel Roller's effect
2021-11-03 23:23:28 -03:00
BuffelSaft
eeb40daede
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil2
2021-11-04 13:52:58 +13:00
LOuroboros
f6628e301f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry
2021-11-03 20:43:33 -03:00
LOuroboros
f0d7c75ec8
Syntax corrections
2021-11-03 17:48:04 -03:00
ghoulslash
48c29a9cd8
proper mirror armor sticky web targeting
2021-11-03 15:05:52 -04:00
GriffinR
e14210ce1f
Merge pull request #1536 from GriffinRichards/clean-braille
...
Add font id constants, better braille support
2021-11-03 13:17:29 -04:00
GriffinR
0ba22ca112
Merge pull request #1534 from GriffinRichards/doc-btrans
...
Document battle transition
2021-11-03 11:26:20 -04:00
LOuroboros
af6e72ecfe
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-11-03 08:56:01 -03:00
Blackforest92
b9c23f7c62
Update waterfall, trick room, & focus blast BG
2021-11-03 16:29:09 +07:00
BuffelSaft
6ce1f01b8c
Hunger Switch and Aura Wheel
...
Implement the ability Hunger Switch and the move Aura Wheel.
2021-11-03 19:45:03 +13:00
BuffelSaft
18b87416d5
Fixes
...
- Fix Sheer Force interaction (needed after adding | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN)
- Fix "X Transformed!" target
- Allow switching between both forms
- Allow form change if target is KO'ed
2021-11-03 17:56:16 +13:00
BuffelSaft
74c85b5818
Implement Relic Song's form change
...
Meloetta transforms into its pirouette form after using Relic Song, unless it has Sheer Force or the move has no effect. It also has a chance to put both targets to sleep.
2021-11-03 17:23:33 +13:00
BuffelSaft
f323e2c047
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil
2021-11-03 14:18:28 +13:00
BuffelSaft
d99fd30e4d
Looping battle script, correct message
...
Testing in Sword showed that the pop up should happen once if two mons are cured, and that the correct message is "X was cured of its poisoning!"
2021-11-03 11:51:20 +13:00
LOuroboros
69b42de0d9
Implemented Mimicry
...
Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
2021-11-02 14:44:55 -03:00
Blackforest92
0f5c9f5cb0
Adjust Giga Impact background to fade in before impact
2021-11-03 00:37:22 +07:00
ghoulslash
592a1dab63
fix mirror armor setstatchanger, handle reflected stat blockage
2021-11-02 12:02:58 -04:00
ghoulslash
ffcba355b0
merge w be
2021-11-02 10:36:08 -04:00
BuffelSaft
4668e11765
Looping battlescript version 1
...
Would be better if it simply updated the target, cured the status and returned I think, needs testing.
2021-11-03 00:45:24 +13:00
BuffelSaft
95435b5f7f
Pastel Veil switchin effect attempt
...
Battle script isn't working for partner for some reason.
2021-11-02 23:06:10 +13:00
BuffelSaft
40bced517a
Pastel Veil blocks poison for whole side
...
Tested vs Toxic, Toxic Thread and Sludge with 100% effect chance.
2021-11-02 20:00:57 +13:00
Blackforest92
2d5ed4a1e2
Allow Giga Impact fadein background & upgrade its graphic
2021-11-02 12:53:11 +07:00
BuffelSaft
1e3b3d482b
Merge pull request #1838 from Blackforest92/battle_engine
...
Edit Spacial Rend and Hurricane background
2021-11-02 17:11:47 +13:00
Eduardo Quezada D'Ottone
f3013d8ee9
Standarized Solarbeam into Solar Beam
2021-11-01 18:36:35 -03:00
ghoulslash
e4242d04ab
remove battler skipping in neutralizing gas exit bs
2021-11-01 14:28:41 -04:00
ghoulslash
48bea554a3
fix tryendneutralizinggas placement
2021-11-01 14:21:28 -04:00
ghoulslash
98b4b821dc
merge with be
2021-11-01 13:55:55 -04:00
ghoulslash
a1e64fce4f
handle simple beam, gastro acid
2021-11-01 13:50:57 -04:00
ghoulslash
b5d20da927
merge with be
2021-11-01 11:36:18 -04:00
BuffelSaft
5d678bc2ce
Fix move effect defines
...
Had a define in a comment, which offset all the new move effects and misaligned their battle scripts.
2021-11-01 23:51:03 +13:00
BuffelSaft
0345dea918
Replace EFFECT_DOUBLE_HIT with FLAG_TWO_STRIKES
...
This removes the need to have separate move effects for Twineedle, Double Iron Bash, and any custom two strike moves.
2021-11-01 23:39:37 +13:00
BuffelSaft
fb25e1ac98
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-11-01 22:37:23 +13:00
BuffelSaft
fbce8b2ff0
Merge pull request #1749 from ghoulslash/wandering_spirit
...
Wandering Spirit
2021-11-01 11:26:53 +13:00
Blackforest92
9b6cd383a4
Optimized Rock Wrecker and Hurricane
2021-11-01 01:06:39 +07:00
ghoulslash
52d4d1cd34
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella
2021-10-31 11:40:00 -04:00
ghoulslash
bc170f3a43
merge with be
2021-10-31 11:04:39 -04:00
Blackforest92
c87e2433a7
Minor fix to Steel Beam
2021-10-31 21:41:39 +07:00
GriffinR
36039e1b86
Convert fonts.s to C
2021-10-31 01:44:18 -04:00
ghoulslash
e1f0e6285b
Merge pull request #1828 from BuffelSaft/gorilla-tactics
...
Implement Gorilla Tactics
2021-10-30 21:44:33 -04:00
GriffinR
fdaf436960
Add font id constants
2021-10-30 19:54:15 -04:00
GriffinR
13cd2a41f0
Better braille support
2021-10-30 16:19:10 -04:00
GriffinR
71605556ab
Clean up braille_puzzles
2021-10-30 11:59:14 -04:00
LOuroboros
0ddcb69c65
Fixed Move_SPECIAL_REND typo
2021-10-30 12:14:28 -03:00
ghoulslash
468ee66cd8
fix synthesis and leaf guard w utility umbrella
2021-10-30 11:04:50 -04:00
GriffinR
875be8a8a8
Merge pull request #1528 from GriffinRichards/doc-ereaderscr
...
Document ereader screen
2021-10-30 09:34:14 -04:00
ghoulslash
ee7b63e372
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella
2021-10-30 09:26:33 -04:00
ghoulslash
3e364b4870
switchin abilities activate after wandering spirit
2021-10-30 09:16:33 -04:00
ghoulslash
f4537b1213
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into wandering_spirit
2021-10-30 09:14:32 -04:00
ghoulslash
4b0325dbe4
neutralizing gas switchout
2021-10-30 09:13:08 -04:00
Blackforest92
799852ea77
Introduce alternate Steel Beam
2021-10-30 17:00:55 +07:00
BuffelSaft
47bfeaeecd
Implement Gorilla Tactics
...
It's Choice Band but as an ability.
2021-10-30 18:31:44 +13:00
ghoulslash
af914ee7ed
merge w be
2021-10-29 22:33:50 -04:00
ghoulslash
28bc7dc14d
start ability
2021-10-29 22:32:19 -04:00
BuffelSaft
6b65ef5bcf
Merge pull request #1824 from ghoulslash/itemheal_fix
...
Fix iteam healing after a failed move
2021-10-30 15:25:28 +13:00
BuffelSaft
f0e9b09258
Merge pull request #1822 from ghoulslash/harvest
...
fix recycle and harvest
2021-10-30 15:00:56 +13:00
GriffinR
07bf225f94
Continue battle_transition documenting
2021-10-29 11:24:36 -04:00
ghoulslash
2502820e83
document a couple hitmarkers. fix failing moves not updating hp from own healing effects
2021-10-29 09:03:14 -04:00
ghoulslash
204748e01a
fix recycle and harvest
2021-10-28 17:52:52 -04:00
ghoulslash
f342e7c590
merge with be
2021-10-28 17:03:10 -04:00
ghoulslash
e2e31f0b74
skill swap config option for switchin abilities
2021-10-28 16:53:00 -04:00
LOuroboros
a77f058146
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-10-28 14:24:43 -03:00
ghoulslash
34e966fdee
Merge pull request #1815 from LOuroboros/hyperspaceFury
...
Implemented Hyperspace Fury
2021-10-28 13:20:33 -04:00
LOuroboros
82101d3581
Optimizations
2021-10-28 14:02:43 -03:00
LOuroboros
28522f3ffb
Fixed Hyperspace Fury not breaking through protections
...
Also repositioned VARIOUS_JUMP_IF_SPECIES.
2021-10-28 12:09:44 -03:00
ghoulslash
bebaded415
merge with be
2021-10-27 16:48:38 -04:00
LOuroboros
de157919b0
Added animations for Shell Side Arm
2021-10-27 11:14:17 -03:00
LOuroboros
d5b5090d52
Fixed BattleScript_EffectPhotonGeyser
2021-10-27 11:14:08 -03:00
LOuroboros
fc7f1acf20
Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser
2021-10-27 11:13:59 -03:00
GriffinR
fbf3bf2ce8
Replace 'mystery_event_club'
2021-10-26 22:43:56 -04:00
LOuroboros
1ab8c84f41
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury
2021-10-26 21:23:21 -03:00
Eduardo Quezada D'Ottone
773c773bac
Merge remote-tracking branch 'RHH/battle_engine' into BE_ghostEscape
...
# Conflicts:
# include/constants/battle_config.h
2021-10-26 20:35:01 -03:00
GriffinR
b0c27a8521
Document ereader screen
2021-10-26 15:44:42 -04:00
GriffinR
d6571f2355
Merge pull request #1525 from GriffinRichards/doc-recmix
...
Document remainder of Record Mixing
2021-10-26 14:18:38 -04:00
ghoulslash
83c1170698
Merge pull request #1802 from LOuroboros/rapidSpin
...
Fixed Rapid Spin
2021-10-25 15:47:27 -04:00
LOuroboros
442376e75b
Replaced jumpifbyte with jumpifhalfword in a few BattleScripts
2021-10-25 16:36:17 -03:00
GriffinR
6dc3c9864c
Merge pull request #1520 from GriffinRichards/doc-random
...
Document random remaining symbols
2021-10-24 23:43:17 -04:00
GriffinR
ab80264921
Merge pull request #1519 from GriffinRichards/doc-mgift
...
Document Mystery Gift
2021-10-24 15:50:39 -04:00
GriffinR
7f3c529935
Document record mixing mail swap
2021-10-24 15:49:19 -04:00
Eduardo Quezada D'Ottone
f4ff76c8ae
MOVE_EFFECT_MEAN_LOOK now fails on ghost types.
2021-10-23 11:42:33 -03:00
Eduardo Quezada D'Ottone
76b6250104
Merge branch 'battle_engine' into plasmaFists
2021-10-23 11:06:34 -03:00
Eduardo Quezada D'Ottone
382ec13492
Merge pull request #1752 from ghoulslash/quick_draw
...
Quick Draw
2021-10-22 22:39:03 -03:00
LOuroboros
4c90cbe625
Repositioned the gMoveResultFlags check
2021-10-22 19:58:27 -03:00
LOuroboros
24876ac5e3
Small tweak for BattleScript_EffectRapidSpin
2021-10-22 07:21:31 -03:00
LOuroboros
dd82e051bd
Fixed Rapid Spin raising Speed even when the move fails
2021-10-22 07:21:10 -03:00
LOuroboros
a6315ffc75
Implemented Plasma Fists
2021-10-19 09:50:18 -03:00
LOuroboros
d9b8e11a9c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE
2021-10-19 07:47:42 -03:00
GriffinR
24b4e898ad
More mauville_old_man clean up
2021-10-18 14:40:04 -04:00
GriffinR
7590bacec1
Label remaining symbols in field_specials
2021-10-18 02:14:29 -04:00
GriffinR
db8ce5d7f9
Clean up mauville_old_man, drop ScrSpecial prefix
2021-10-18 01:09:41 -04:00
ghoulslash
8dc77e6fe3
Merge pull request #1782 from LOuroboros/glare
...
Updated Glare
2021-10-17 22:11:33 -04:00
Eduardo Quezada D'Ottone
ead5c92469
Merge branch 'battle_engine' into PLG
2021-10-17 17:38:54 -03:00
LOuroboros
e7ad7319e3
Updated Glare
2021-10-17 12:03:35 -03:00
LOuroboros
d6304099ac
Review optimization
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-10-17 09:42:31 -03:00
LOuroboros
59cfbe55c1
Gave Grav Apple a move effect of its own
2021-10-17 09:27:35 -03:00
GriffinR
ece7ef3410
Correct usage of MysteryEvent to MysteryGift
2021-10-17 03:00:48 -04:00
GriffinR
3cd27acbea
Document wonder news
2021-10-17 02:09:31 -04:00
GriffinR
845a5e99cc
General mystery gift documentation, finish mystery gift client/server/scripts
2021-10-16 23:35:17 -04:00
GriffinR
e1900efe1e
Merge branch 'master' into doc-miscbattle
2021-10-15 22:46:43 -04:00
GriffinR
c02001c46d
Document mystery gift link scripts, general mystery gift
2021-10-15 12:05:06 -04:00
Eduardo Quezada D'Ottone
0a090616ef
Merge pull request #1765 from ghoulslash/shell_smash
...
Shell Smash Animation
2021-10-15 12:09:06 -03:00
BuffelSaft
e59be67023
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-10-15 16:25:11 +13:00
Eduardo Quezada D'Ottone
21837b659a
Merge branch 'battle_engine' into bug_bite
2021-10-14 19:46:50 -03:00
Eduardo Quezada D'Ottone
8be9e4ae1d
Merge pull request #1763 from BuffelSaft/battle_bond
...
Fix Battle Bond
2021-10-14 18:23:13 -03:00
ghoulslash
85ce72a4d0
add shell smash anim
2021-10-14 10:47:39 -04:00
BuffelSaft
85dd7ff63c
Fix Storm Drain/Dive bug
...
If Storm Drain is triggered by dive it should clear the attacker's semi-invulnerable status.
2021-10-14 16:40:18 +13:00
BuffelSaft
fc6e8f598c
Merge branch 'battle_engine' into battle_bond
2021-10-14 16:24:59 +13:00
BuffelSaft
bb8d0e3d6b
Fix Battle Bond
...
Battle Bond Greninja transforms only after a KO, and doesn't revert when switched out.
2021-10-14 16:18:11 +13:00
Eduardo Quezada D'Ottone
d689842689
Merge pull request #1657 from ghoulslash/rototiller
...
Rototiller Fix + MOVE_TARGET_ALL_BATTLERS
2021-10-13 22:45:50 -03:00
ghoulslash
7f2efb6619
format fixes, fix healing berries from printing message at full hp
2021-10-13 18:40:45 -04:00
ghoulslash
a3d2bdc9cf
merge with be
2021-10-13 18:30:53 -04:00
GriffinR
def6cc8158
Label battle script macro arguments
2021-10-13 17:44:04 -04:00
GriffinR
fc15b0d5f0
Add controller buffer constants, finish misc battle doc
2021-10-13 16:21:39 -04:00
ghoulslash
3248bd796a
add quick draw
2021-10-12 21:49:18 -04:00
ghoulslash
996301d5d3
add mirror armor
2021-10-12 18:04:34 -04:00
ghoulslash
bbd09fdcf7
add wandering spirit
2021-10-12 10:32:51 -04:00
GriffinR
f23e0beeba
Rename battle anim cmds, move its data, name remaining symbols
2021-10-11 13:18:21 -04:00
ghoulslash
6212a3c431
Merge pull request #1703 from AsparagusEduardo/fix_ConfuseBerries
...
Fixed confuse berries affecting the wrong battler.
2021-10-10 20:21:03 -04:00
ghoulslash
06bcfea3b8
merge with be
2021-10-10 19:56:33 -04:00
ghoulslash
fcada4fcad
handle rototiller + prankster
2021-10-10 19:54:17 -04:00
Eduardo Quezada D'Ottone
7798468ce9
Merge pull request #1738 from BuffelSaft/safety-googles
...
Fix Safety Googles
2021-10-10 18:34:20 -03:00
Eduardo Quezada D'Ottone
01f563cb5e
Fix infinite loop
2021-10-10 08:46:31 -03:00
BuffelSaft
8a7e6379b6
Merge pull request #1732 from ghoulslash/perish_song
...
Fix Soundproof cancelling out user's Perish Song
2021-10-10 22:55:20 +13:00
LOuroboros
91a68cd5db
Implemented Primal Reversion
2021-10-09 00:36:41 -03:00
BuffelSaft
07bdd2ffe6
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-10-09 15:18:51 +13:00
BuffelSaft
274e964d91
Fix Safety Googles
...
Fix typo and update gLastUsedItem before calling the safety goggles battle script.
2021-10-09 15:05:01 +13:00
GriffinR
31b501e7eb
Start misc battle documentation
2021-10-08 16:39:46 -04:00
ghoulslash
ce455ac7e7
merge with be
2021-10-08 07:44:32 -04:00
BuffelSaft
fbc4d7584e
Merge pull request #1610 from LOuroboros/primalAbilities
...
Implement Desolate Land, Primordial Sea and Delta Stream
2021-10-08 20:01:09 +13:00
ghoulslash
9a4e0cf757
magician fixes, handle edge cases
2021-10-07 17:37:47 -04:00
GriffinR
a2655ba9ab
Merge branch 'master' into doc-union
2021-10-07 16:10:35 -04:00
LOuroboros
359da5313e
Handled some edge cases
...
Gastro Acid, Worry Seed, Simple Beam, Core Enforcer and Transform
2021-10-07 01:53:20 -03:00
LOuroboros
7548e74013
Forgot to clear the primal weathers in some places
2021-10-07 00:43:23 -03:00
ghoulslash
1031703309
magician base functionality
2021-10-06 16:00:02 -04:00
ghoulslash
5f5df066d6
fix perish song + soundproof
2021-10-06 15:18:42 -04:00
ghoulslash
4aeadd96c9
merge with be
2021-10-06 14:49:23 -04:00
ghoulslash
391cfabcac
merge with be
2021-10-06 14:31:21 -04:00
ghoulslash
4382420dd2
merge with be
2021-10-06 13:32:59 -04:00
ghoulslash
1f4844c7f5
Merge pull request #1710 from AsparagusEduardo/BE_Struggle
...
Implemented modern effect of struggle with config
2021-10-06 09:27:10 -04:00
LOuroboros
2b32581c14
Fixed infinite loop
2021-10-06 09:27:33 -03:00
LOuroboros
b520fe5d89
Tweaked Strong Winds' animation
2021-10-06 08:38:19 -03:00
LOuroboros
fe5a0a7f04
Oopsie
2021-10-06 08:29:53 -03:00
LOuroboros
a646c3311b
Another set of fixes
...
The ability pop up is supposed to show as weather changing abilities try but fail to activate.
2021-10-06 08:20:50 -03:00
LOuroboros
0f2cc99f45
WEATHER_STRONG_WINDS modifier fix
...
MulByTypeEffectiveness was the right answer all along.
I also added a short pause to BattleScript_AttackWeakenedByStrongWinds before STRINGID_ATTACKWEAKENEDBSTRONGWINDS is printed.
2021-10-06 07:33:54 -03:00
LOuroboros
dc451167d1
More fixes
...
-Removed ability popup when Strong Winds weakens a SE Flying-type move
-Went back to the way I handled the dmg calculation for that originally
-Made sure to try to clear the primal weathers in a couple of other battle scripts
-Allowed Drought, Drizzle, Sand Stream and Snow Warning to activate but fail if WEATHER_STRONG_WINDS is in effect.
2021-10-06 05:54:28 -03:00
Eduardo Quezada D'Ottone
43d42c95cf
Terrain Pulse effect implemented
2021-10-04 22:45:37 -03:00
Eduardo Quezada D'Ottone
e2bf660c97
Secret Power field terrain animations
2021-10-04 21:51:51 -03:00
LOuroboros
dcefb523f8
Tweaks and fixes
...
-Fixed the Flying-type checks of WEATHER_STRONG_WINDS.
-Fixed the order of actions involving the printing of STRINGID_ATTACKWEAKENEDBSTRONGWINDS.
2021-10-04 08:12:41 -03:00
LOuroboros
b85b3094c8
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalAbilitiesDev
2021-10-03 07:05:56 -03:00
Eduardo Quezada D'Ottone
1e0ae9a154
Tabs to spaces.
2021-10-02 20:54:04 -03:00
Eduardo Quezada D'Ottone
57ea20bc6d
Implemented modern effect of struggle with config
2021-10-02 13:32:36 -03:00
LOuroboros
c464b1b5dd
STRINGID_ATTACKERBECAMEASHGRENINJA -> STRINGID_ATTACKERBECAMEASHSPECIES
2021-10-01 23:12:59 -03:00
LOuroboros
f3ded43a88
Implemented Battle Bond
2021-10-01 22:49:17 -03:00
Eduardo Quezada D'Ottone
7287560521
Fixed confuse berries affecting the wrong battler.
2021-10-01 18:28:51 -03:00
LOuroboros
f691769647
Fixed Def stat reduction
2021-10-01 06:29:21 -03:00
LOuroboros
a506bf03c6
Corrected Flower Veil check
2021-10-01 02:14:46 -03:00
LOuroboros
d7e651696b
Even more fixes
...
-Changed the way in which Gulp Missile checks for a fainted opponent, just in case the reason why the attacker's defense wasn't being lowered is that the script was falling into BattleScript_GulpMissileNoSecondEffectGulping
-Took into account max Defense stat stage, because I forgot to do that too.
-Slightly changed the Defense reduction code, just in case.
-Fixed the text string that was printed. Gulp Missile doesn't raise a stat, after all.
-Fixed the script that was being called if the attacker has Clear Body, and also added jumps for Full Metal Body, White Smoke and Flower Veil.
2021-09-30 10:37:49 -03:00
Pokestia
38a4dea402
Rename Battle Weather flags
2021-09-30 12:08:20 +02:00
LOuroboros
0389dbf9f2
More fixes
...
-Removed IsBattlerAlive check for case ABILITY_GULP_MISSILE in ABILITYEFFECT_MOVE_END_ATTACKER. Turns out Cramorant can change form even on single wild battles.
-Added a check for IsBattlerAlive in the case ABILITY_GULP_MISSILE of ABILITYEFFECT_MOVE_END, because otherwise, for whatever reason, the user was trying to trigger the Gulping effect even in its base form.
-Set the stat to change for the Gulping effect from within the battle script. The rest of the effect is handled there, so may as well.
-Fixed the check for case ABILITY_GULP_MISSILE in ABILITYEFFECT_MOVE_END_ATTACKER. Apparently, a silent species change was happening because of the order of the checks. Thanks to AsparagusEduardo for pointing this one out.
-Fixed the secondary effect of a target's Gulp Missile affecting an attacker that has fainted.
-Fixed the Defense reduction of the Gulping effect bypassing Clear Body.
2021-09-29 23:18:22 -03:00
Pokestia
e699965332
Use compact weather macros
2021-09-29 17:45:39 +02:00
LOuroboros
a49ea33dd0
A lot of fixes
...
-Fixed Gulp Missile's activation. Its effects were happening even if the conditions weren't actually met in battle.
-Fixed Gulp Missile activating if the only/last target has already fainted.
-Fixed Gulp Missile's Gorging animation, though it still uses Tackle's.
-Fixed Gulp Missile's Gorging attack affecting an opponent with Magic Guard.
-Fixed Gulp Missile changing Cramorant's form if Surf failed.
2021-09-27 08:57:09 -03:00
ghoulslash
761006a164
merge with be
2021-09-26 19:19:32 -04:00
LOuroboros
872d2a7008
Made this build again
2021-09-25 22:33:07 -03:00
LOuroboros
1b039062da
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile
2021-09-25 22:20:34 -03:00
GriffinR
a66d7e1b43
Document some single-remaining symbols
2021-09-24 17:14:20 -04:00
Syreldar
4c05520bf3
Fixed Retaliate's naming.
2021-09-24 16:02:26 +02:00
ghoulslash
2f69748e0d
merge with be
2021-09-23 14:38:01 -04:00
ghoulslash
94ec25319f
syntax fixes. Use BlocksPrankster for perish song battle script
2021-09-23 14:35:37 -04:00
ghoulslash
d4a153bf14
Update data/battle_scripts_1.s
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-09-23 12:21:16 -06:00
BuffelSaft
530998c4b7
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-09-23 16:41:35 +12:00
BuffelSaft
2f03ac31b9
Multihit refactor and Parental Bond
...
Port multihit system from the CFRU, implement Parental Bond, refactor certain moves as required and implement all remaining multi hit moves except Dragon Darts.
2021-09-23 14:31:21 +12:00
Eduardo Quezada D'Ottone
2c66aa84b6
Merge pull request #1378 from ghoulslash/gen8_move_effects
...
Several Gen 8 Move Effects
2021-09-22 22:48:29 -03:00
ghoulslash
d738297f24
merge with be
2021-09-22 16:26:09 -04:00
ghoulslash
3559a1b8e6
fix prankster + magic coat
2021-09-22 16:09:23 -04:00
ghoulslash
8cc0bb6ac0
Merge pull request #1652 from BuffelSaft/multi-hit-resist-berry
...
Fix multihit moves vs damage reducing berries
2021-09-22 09:42:53 -06:00
ghoulslash
13062b5a8f
fix lash out, obstruct, and decorate
2021-09-22 09:43:40 -04:00
ghoulslash
80a48de702
ally cannot block prankster + perish song
2021-09-21 11:54:59 -04:00
ghoulslash
32d19a9b19
syntax fixes. add B_PRANKSTER_DARK_TYPES check to perish song
2021-09-20 21:36:10 -04:00
ghoulslash
0ea6c65b83
merge with be
2021-09-17 09:10:09 -04:00
ghoulslash
faa963fd04
merge with be
2021-09-17 09:07:38 -04:00
ghoulslash
b916d7991c
merge with be
2021-09-16 21:52:29 -04:00
ghoulslash
e756b0accc
merge with be
2021-09-16 21:41:29 -04:00
ghoulslash
af8d86f0c9
merge with be
2021-09-16 13:33:35 -04:00
ghoulslash
c2e0990aab
fix some merge conflicts
2021-09-16 13:29:36 -04:00
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
ExpoSeed
5a5c257f68
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-09-02 21:43:20 -05:00
ghoulslash
7c53214dad
merge with be
2021-09-02 15:33:42 -04:00
