GriffinR
93705bc257
Label phonemes
2021-11-06 12:30:40 -04:00
GriffinR
44295261b0
Give programmable wave samples generic names
2021-11-06 12:07:42 -04:00
GriffinR
abab6cef09
Label remaining m4a functions
2021-11-06 11:42:34 -04: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
ghoulslash
f7d11527aa
Merge pull request #1867 from AsparagusEduardo/BE_synchroToxic
...
Config for Synchronize's interaction with toxic poisoning
2021-11-06 10:36:50 -04:00
GriffinR
f9e8c88eb5
Merge pull request #1543 from cbt6/move-fastest
...
Rename WalkFastest functions to WalkFaster
2021-11-06 10:32:59 -04:00
Eduardo Quezada D'Ottone
62b6accbcc
Using IsBattlerTerrainAffected
2021-11-06 11:07:40 -03: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
ghoulslash
01d9d4c7d7
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be/speeduphit
2021-11-06 08:53:09 -04:00
ghoulslash
03f290d937
add check for plus_2 effects
2021-11-06 08:53:00 -04: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
LOuroboros
c2e8c1058f
Force set gSwapDamageCategory's initial value in Photon Geyser's and Shell Side Arm's calculations
2021-11-05 23:07:26 -03:00
LOuroboros
4bdbef9a9d
Use the right defensive target stats during Shell Side Arm calculation
2021-11-05 22:21:50 -03:00
Eduardo Quezada D'Ottone
202827068c
a
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-11-05 21:25:42 -03:00
Eduardo Quezada D'Ottone
63a7618f07
Merge pull request #1850 from BuffelSaft/relic_song
...
Finish Relic Song's effect
2021-11-05 21:17:00 -03:00
Eduardo Quezada D'Ottone
8e49e3e653
Config for Synchronize's interaction with toxic poisoning
2021-11-05 21:16:13 -03: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
GriffinR
27957b5c1f
Merge pull request #1545 from sphericalice/pal-constants
...
Use relevant constants for BlendPalettes
2021-11-05 18:05:41 -04:00
sphericalice
6e49b45eb6
Use relevant constants for BlendPalettes
2021-11-05 21:58:13 +00:00
Eduardo Quezada D'Ottone
6c70a6b872
Merge pull request #1863 from LOuroboros/soulDewBE
...
Added a battle config for the Soul Dew
2021-11-05 17:09:44 -03:00
LOuroboros
b23d5db598
Oops
2021-11-05 13:02:16 -03: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
LOuroboros
13029cd3b3
Tweaked VARIOUS_PHOTON_GEYSER_CHECK and VARIOUS_SHELL_SIDE_ARM_CHECK
2021-11-05 10:55:57 -03:00
ghoulslash
0b2542e447
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into smart_wild_ai
2021-11-05 09:46:12 -04:00
LOuroboros
d15eeeb8eb
Fixed the comment for B_SOUL_DEW_BOOST
2021-11-05 10:37:41 -03:00
ghoulslash
6070c70b36
Merge pull request #1865 from BuffelSaft/magma_storm
...
Fix Magma Storm
2021-11-05 09:26:02 -04: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
d91d6c9162
Merge pull request #1856 from ghoulslash/be/ai_magicguard
...
Fix AI discouraging own magic guard
2021-11-05 18:52:34 +13:00
BuffelSaft
3f1ce399e6
Account for terminator in sTrappingMoves
2021-11-05 18:37:45 +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
ghoulslash
dd91cbd08f
Merge pull request #1851 from BuffelSaft/hunger_switch2
...
Hunger Switch and Aura Wheel
2021-11-04 21:40:59 -04: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
Eduardo Quezada D'Ottone
5eb8f1c158
Merge pull request #1855 from ghoulslash/be/abilityonside
...
AI versions of CanPoisonType, CanBePoisoned and IsAbilityOnSide
2021-11-04 21:49:31 -03:00
LOuroboros
9a3739d2bd
Review changes
2021-11-04 21:01:48 -03:00
GriffinR
e65677c944
Update modern linker script
2021-11-04 17:28:41 -04:00
LOuroboros
671cbabc3d
Added a battle config for the Soul Dew
2021-11-04 17:25:31 -03:00
ghoulslash
24cb5f6654
dont trigger x_up_hit effect if battle is over
2021-11-04 15:45:03 -04:00
ghoulslash
a30573f317
Merge pull request #1858 from Jaizu/patch-20
...
Fix comment typo
2021-11-04 15:08:54 -04:00
cbt6
32aaf6912f
Rename movement scripts to use Faster over Fastest
2021-11-05 02:22:28 +08:00
cbt6
0fe3881961
Rename WalkInPlaceFastest to WalkInPlaceFaster
2021-11-05 01:54:34 +08:00
ghoulslash
0ac6860855
Merge pull request #1810 from BuffelSaft/ai_improvements
...
AI: Multi-strike moves, variable power moves, sleep check
2021-11-04 12:28:00 -04:00
GriffinR
c6b83bbb21
Fix merge
2021-11-04 12:18:34 -04:00
ghoulslash
9685d7bae1
Merge pull request #1845 from LOuroboros/mimicry
...
Implemented Mimicry
2021-11-04 12:11:41 -04:00
GriffinR
be7d0bd3b0
Merge branch 'master' into doc-menu
2021-11-04 12:11:31 -04:00
GriffinR
17b657d83a
Finish menu documentation
2021-11-04 11:52:43 -04: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
b64d506809
Made a function to lift Mimicry's effect
2021-11-04 12:20:31 -03:00
