Eduardo Quezada D'Ottone
bef896c65a
Merge pull request #1908 from kleeenexfeu/kleeenexfeu-PartyBattlerShouldAvoidHazardsfix
...
PartyBattlerShouldAvoidHazards fix
2021-11-15 19:54:46 -03: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
c1130592fa
Drop some overworld prefixes
2021-11-15 10:58:05 -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
LOuroboros
de74177966
Oops
2021-11-15 12:52:05 -03:00
kleeenexfeu
ea34d4694d
PartyBattlerShouldAvoidHazards fix
...
AI was loading and modifying wrong data in the RAM
2021-11-15 16:48:44 +01: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
ghoulslash
2a1299715f
merge w be
2021-11-15 10:45:59 -05:00
ghoulslash
9fdd6fffee
AI_GetAbility supports hidden abilities
2021-11-15 10:45:23 -05: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
ghoulslash
0e397c43fe
Merge pull request #1898 from AsparagusEduardo/BE_postIETweaks
...
Adjusted elements to simplify the conflicts between BE and IE
2021-11-15 08:27:28 -05:00
Eduardo Quezada D'Ottone
2a5fed3c65
Merge pull request #1905 from BuffelSaft/aura
...
Fix Dark Aura and Fairy Aura
2021-11-15 08:40:11 -03:00
BuffelSaft
d4fa346540
Fix Dark Aura and Fairy Aura
...
Damage boost should be 33%, not 25%.
2021-11-15 21:40:20 +13:00
GriffinR
d98bd4dba7
Name pokenav region map structs
2021-11-15 01:37:22 -05:00
GriffinR
4275cf4b90
Rename pokenav match call files
2021-11-15 01:30:21 -05:00
GriffinR
14d78d7633
Finish match call menu doc
2021-11-15 01:20:03 -05:00
GriffinR
c779d03b3e
Rename pokenav_match_call_ui
2021-11-15 00:21:40 -05:00
GriffinR
d4d4234283
Finish pokenav list ui doc
2021-11-15 00:09:02 -05:00
GriffinR
7e27a0746d
Misc text clean-up
2021-11-14 22:21:17 -05:00
GriffinR
793947cd4b
Merge pull request #1553 from GBAWiz420/Typo
...
Designate gBattleAnimBgImage_Attract and related as arrays
2021-11-14 18:02:20 -05:00
Wiz
927f9d27df
Designate gBattleAnimBgImage_Attract and related as arrays
2021-11-14 17:08:03 -05:00
ghoulslash
8b296b97a8
Merge pull request #1887 from BuffelSaft/knock-off
...
Fix Knock Off, add config
2021-11-14 08:27:51 -05:00
GriffinR
70577e844d
Merge pull request #1548 from GriffinRichards/doc-banim
...
Document battle_anim_mons
2021-11-13 23:32:10 -05:00
GriffinR
f42eafc85b
Merge branch 'master' into doc-banim
2021-11-13 23:26:46 -05:00
GriffinR
8d18d03c79
Merge pull request #1552 from ProjectRevoTPP/fix_saveblock_reorder
...
Enforce structs to enforce save block order for modern toolchains.
2021-11-13 23:25:29 -05:00
GriffinR
159bb37bbe
Merge branch 'master' into fix_saveblock_reorder
2021-11-13 23:19:57 -05:00
GriffinR
9a932cd9c3
Merge pull request #1549 from GriffinRichards/doc-binterface
...
Document remaining symbols in battle_interface, palette, and save
2021-11-13 23:19:08 -05:00
Eduardo Quezada D'Ottone
5b63f53262
Merge pull request #1834 from ghoulslash/be/neutralizing_gas
...
Add Neutralizing Gas
2021-11-14 00:27:16 -03:00
ProjectRevoTPP
9d3345a6d6
Enforce structs to enforce save block order for modern toolchains.
2021-11-13 21:41:16 -05:00
Eduardo Quezada D'Ottone
80f531e03b
Merge pull request #1899 from BuffelSaft/softlock
...
Fix Cherrim softlock
2021-11-13 23:03:27 -03:00
BuffelSaft
cedc2e07bd
Fix Cherrim softlock
...
Fix typo that caused infinite loop.
2021-11-14 13:31:06 +13:00
GriffinR
8e8b70c15c
Add clarifying comment to LinkFullSave_WriteSector
2021-11-13 17:23:03 -05:00
GriffinR
4c4fa1f25e
Typo fix
2021-11-13 16:56:45 -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
GriffinR
b3e593dff5
Continue pokenav list ui doc
2021-11-13 15:52:58 -05:00
GriffinR
ec05157568
Move pokenav list item union out of list struct
2021-11-13 11:27:11 -05:00
Eduardo Quezada D'Ottone
bcbdb353f5
Adjusted elements to simplify the conflicts between BE and IE
2021-11-13 12:10:20 -03:00
ghoulslash
940a165be7
merge w be
2021-11-13 09:09:15 -05:00
ghoulslash
23104a02e7
Merge pull request #1891 from AsparagusEduardo/BE_assaultVestText
...
Fix Assault Vest's battle message and effect on Me First
2021-11-13 09:06:12 -05:00
Eduardo Quezada D'Ottone
8f52996144
Merge pull request #1892 from ghoulslash/be/wish
...
wish update
2021-11-13 11:01:04 -03:00
Eduardo Quezada D'Ottone
ad393385ac
Oops
2021-11-13 10:58:18 -03: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
ghoulslash
b68c596ce5
Update src/battle_script_commands.c
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-11-13 08:50:30 -05:00
ghoulslash
a4204e5491
Update include/constants/battle_config.h
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-11-13 08:50:24 -05:00
ghoulslash
c779d7f0b0
Merge pull request #1894 from AsparagusEduardo/BE_fixRelicSong
...
Fixed Relic Song's SE
2021-11-13 08:50:01 -05:00
LOuroboros
2fe015e5ce
Implemented Fling
2021-11-13 10:27:05 -03:00
Eduardo Quezada D'Ottone
bcb0f1b915
Merge pull request #1890 from kleeenexfeu/battle_engine
...
Bypassing screens and protections correctly
2021-11-13 10:11:02 -03:00
kleeenexfeu
b3b3cd2c67
IsBattlerProtected
2021-11-13 13:48:08 +01:00
kleeenexfeu
89e9b989c9
Moving isBattlerProtected
2021-11-13 13:40:19 +01:00
