Commit Graph

9585 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
4e7ce0b663 Merge branch 'battle_engine' into BE_configs
# Conflicts:
#	include/constants/battle_config.h
2022-05-07 10:25:34 -04:00
ghoulslash
07579bd42b prevent ally pollen puff selection under heal block. add some ai checks for heal block 2022-05-07 09:56:32 -04:00
ghoulslash
adfb336a3f
Merge pull request #2105 from Sneed69/healblock
Add missing Heal Block functionalities
2022-05-07 09:13:18 -04:00
ghoulslash
e5b777695c
Merge pull request #2107 from Sneed69/steelbeam
Steel Beam Move Effect Implementation
2022-05-07 08:40:34 -04:00
ghoulslash
a88ed6562e
Merge pull request #2115 from AgustinGDLV/spotlight
fixed spotlight function
2022-05-07 08:23:13 -04:00
ghoulslash
f63a451517
Merge pull request #2110 from Sneed69/gen8rattled
Gen 8 Intimidate triggers Rattled
2022-05-07 08:20:39 -04:00
ghoulslash
52dff039b9
Merge pull request #2114 from AgustinGDLV/shed_shell
fixed shed shell
2022-05-07 08:15:10 -04:00
ghoulslash
f821bd313e
Merge pull request #2116 from AgustinGDLV/bolt_beak
fixed bolt beak switch-in boost
2022-05-07 08:13:05 -04:00
sneed
ef7cd3cdfe BattleScript_DefiantActivates rename 2022-05-06 11:15:24 +03:00
AgustinGDLV
382cd41d12 realized hold effect is defined already 2022-05-05 22:49:46 -07:00
AgustinGDLV
74cc8c5ecb fixed bolt beak switch-in boost 2022-05-05 22:37:28 -07:00
AgustinGDLV
aff1d3949f fixed spotlight function 2022-05-05 21:58:16 -07:00
AgustinGDLV
07b42d62ef fixed shed shell 2022-05-05 20:46:45 -07:00
AgustinGDLV
e730d64945 corrections 2022-05-05 15:54:33 -07:00
AgustinGDLV
e343c73cd8 fixed compile error + small tweaks 2022-05-05 15:17:31 -07:00
AgustinGDLV
6235970722 added special battle evo changes 2022-05-05 11:41:27 -07:00
sneed
6c23eb431d Heal Pulse and Pollen Puff 2022-05-05 13:56:59 +03:00
sneed
865b771db7 initial commit 2022-05-05 00:57:19 +03:00
sneed
60d7d8f97e Initial Commit 2022-05-03 03:38:44 +03:00
sneed
b17d1f7816 Add generation specific interactions 2022-05-02 17:56:09 +03:00
sneed
be6148d876 Add missing Heal Block functionalities 2022-05-02 04:54:25 +03:00
ghoulslash
f0d74b60ff
Merge pull request #1932 from BuffelSaft/gen_8_moves_batch2
Gen 8 moves batch + Beak Blast
2022-05-01 07:47:11 -04:00
BuffelSaft
cbf0a6704b Set Sticky Web user to Court Change user
This is for Mirror Armor to track the current user of Sticky Web/the mon that caused the stat drop.
2022-05-01 12:54:33 +12:00
ghoulslash
2a1733349a
Merge pull request #2101 from LOuroboros/patch-3
Updated trainer slide-in array
2022-04-27 10:03:02 -04:00
LOuroboros
66d8409075 Update post review 2022-04-27 10:03:32 -03:00
ghoulslash
29d8ed9602
Merge pull request #2083 from AsparagusEduardo/BE_moveDesc
Adjusted description of Glacial Lance and Astral Barrage
2022-04-27 08:46:48 -04:00
BuffelSaft
746d9ea6c5 Add AI_GetBattlerMoveTargetType()
Add AI version of the function that handles move target selection, as it needs to have ability and item info that it may not have access to.
2022-04-27 22:23:20 +12:00
BuffelSaft
af6242f2e0 Requested changes, Sticky Web edge case
Fix issues found by ghoulslash, and make sure Defiant works properly with Sticky Web and Court Change.
2022-04-27 21:51:10 +12:00
GriffinR
2b223acd87 Fix math in CreateBerrySprite 2022-04-26 21:44:11 -04:00
BuffelSaft
5358cc0a00 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-04-25 13:38:13 +12:00
LOuroboros
487e3c46d1
Updated trainer slide-in array 2022-04-24 17:27:23 -03:00
Eduardo Quezada D'Ottone
5f463733a2
Merge pull request #2100 from LOuroboros/spShellSideArm
Improved the special animation of Shell Side Arm
2022-04-23 10:52:33 -04:00
LOuroboros
055c72a384 Improved the special animation of Shell Side Arm 2022-04-23 04:29:15 -03:00
GriffinR
ef4d99c87e
Merge pull request #1645 from acidghost/fix-find-libpng
Fix finding libpng in gbagfx and rsfont on macOS M1
2022-04-20 10:47:12 -04:00
Kurausukun
0bda107188 don't build modern with -g by default 2022-04-20 01:07:10 -04:00
GriffinR
fc5747f0f7
Merge pull request #1649 from GriffinRichards/clean-trainer
Trainer hill clean up
2022-04-20 00:20:44 -04:00
GriffinR
493210d66f
Merge pull request #1653 from SBird1337/fix/agbprint
fix building without NDEBUG on agbcc
2022-04-16 14:57:06 -04:00
sbird
59cff2190d fix building without NDEBUG on agbcc 2022-04-16 19:03:20 +02:00
Eduardo Quezada D'Ottone
bb44db79f7
Merge pull request #2087 from LOuroboros/bePret
Pret merge for the battle_engine
2022-04-13 12:32:16 -04:00
Eduardo Quezada D'Ottone
8a7e8e9805
Apply suggestions from code review 2022-04-12 21:13:48 -04:00
LOuroboros
b6e2945072 Merge branch 'master' of https://github.com/pret/pokeemerald into bePret 2022-04-11 01:22:10 -03:00
ghoulslash
d8ab6c3b14
Merge pull request #2084 from AsparagusEduardo/BE_SkyDropBattleString
Moved Sky Drop battle string to where other battle strings are
2022-04-04 17:27:59 -04:00
Eduardo Quezada D'Ottone
454068095c Moved Sky Drop battle string to where other battle strings are 2022-04-04 16:59:01 -04:00
Eduardo Quezada D'Ottone
d604d99d6e Adjusted description of Glacial Lance and Astral Barrage 2022-04-03 16:54:07 -04:00
Eduardo Quezada D'Ottone
dafb5ca74d Fixed trapping moves not reflecting the configured turn config 2022-04-03 13:03:53 -04:00
GriffinR
8103caea15
Merge pull request #1650 from ISSOtm/patch-1
Add Arch Linux install instructions
2022-04-03 10:59:25 -04:00
Eldred Habert
e1f89c70d9 Add Arch Linux install instructions
I didn't test the devkitARM install instructions, but they are pretty much transcribed from the Ubuntu/Deb ones, so that should be fine.
2022-04-03 11:37:22 +02:00
Eduardo Quezada D'Ottone
8262e967a3
Merge pull request #1906 from LOuroboros/flingBE
Implemented Fling (1/2)
2022-04-02 16:22:58 -03:00
GriffinR
00e0eefe09 Document trainer hill prize selection 2022-04-01 01:37:48 -04:00
GriffinR
44b44d3e77
Merge pull request #1648 from GriffinRichards/factory-bugfix
Add bugfix for Battle Factory trainer IVs
2022-03-31 22:26:03 -04:00