ghoulslash
3a77b52bad
Merge pull request #2194 from AsparagusEduardo/BE_pretmerge
...
Battle Engine pret merge
2022-07-22 14:00:40 -04:00
Blackforest92
56f4c319a4
Fix multiple pokemon graphics, tidying pokemon graphic folders
2022-07-22 22:17:29 +07:00
ghoulslash
a51acab9e3
Merge pull request #2193 from AsparagusEduardo/BE_plusMinus
...
Config for Plus and Minus interaction
2022-07-21 16:48:04 -04:00
Eduardo Quezada D'Ottone
af72fb0d32
Simplified pre-gen5 checks
2022-07-21 16:36:07 -04:00
Eduardo Quezada D'Ottone
56b9a50109
Merge remote-tracking branch 'RHH/battle_engine' into BE_plusMinus
...
# Conflicts:
# include/constants/battle_config.h
2022-07-21 16:28:16 -04:00
ghoulslash
24bb2f7ed0
Merge pull request #2179 from LOuroboros/pinch
...
Removed global and unused IsPinchBerryItemEffect
2022-07-21 16:14:56 -04:00
ghoulslash
49a932a892
Merge pull request #2205 from AsparagusEduardo/BE_LightThatBurnsTheSky
...
Fixed Light That Burns The Sky not using the calculated damage category
2022-07-21 16:14:38 -04:00
ghoulslash
30a494f964
Merge pull request #2197 from AsparagusEduardo/BE_explosion
...
Config for Explosion halving defense
2022-07-21 16:11:32 -04:00
ghoulslash
504600c996
Merge pull request #2201 from AsparagusEduardo/BE_sturdy
...
Config for Sturdy's Gen5+ effect.
2022-07-21 16:09:01 -04:00
ghoulslash
2ce32afeaa
Merge pull request #2202 from AsparagusEduardo/BE_SkyDrop
...
Sky Drop fixes
2022-07-21 16:06:42 -04:00
ghoulslash
2fc15ab779
Merge pull request #2203 from AsparagusEduardo/BE_ghostEscapeAiFix
...
Ghost Escape config AI fix
2022-07-21 16:00:33 -04:00
Eduardo Quezada D'Ottone
e4ae280ca6
Fixed calls to IsZMove
2022-07-21 15:32:14 -04:00
Eduardo Quezada D'Ottone
25397e5794
Fixed Light That Burns The Sky not using the calculated damage category
...
Also:
- Modified move defines to ease with future move expansion.
- Enabled Instruct's check for Z Moves in AI_CheckBadMove.
2022-07-21 15:13:00 -04:00
Eduardo Quezada D'Ottone
eb582b1355
Merge pull request #2178 from ghoulslash/be/ai_fix
...
fix GetAiLogicData logic
2022-07-21 14:47:21 -04:00
ghoulslash
462a144956
Merge pull request #2200 from AsparagusEduardo/BE_ZMove_power
...
Updated Z-Move power for Gen 8 moves and moves with power varying by Gen
2022-07-20 18:10:31 -04:00
ghoulslash
6b28ff6ccf
Merge pull request #2199 from AsparagusEduardo/BE_charge
...
Config for Charge raising Sp. Def., adjusted Growth's config
2022-07-20 18:09:59 -04:00
Eduardo Quezada D'Ottone
d87610a1e0
Ghost Escape config AI fix
2022-07-20 15:31:08 -04:00
Eduardo Quezada D'Ottone
76f5926743
Sky Drop check in IsBattlerTrapped
2022-07-20 15:29:40 -04:00
Eduardo Quezada D'Ottone
343e685537
Sky Drop fixes
...
- Sky Drop was using lbs in the formula instead of hectograms. This has been fixed.
- Sky Drop is now affected by weight modifiers like Float Stone.
- Enabled AI_CheckBadMove for Sky Drop.
2022-07-20 15:13:53 -04:00
Eduardo Quezada D'Ottone
b8ea412e61
AI logic for Charge
2022-07-20 14:44:57 -04:00
Eduardo Quezada D'Ottone
212ecb98ce
Added AI checks.
2022-07-20 14:28:49 -04:00
AgustinGDLV
90d86d4b04
pulled IE
2022-07-20 10:53:19 -07:00
AgustinGDLV
c87910b64e
pulled IE
2022-07-20 10:51:48 -07:00
AgustinGDLV
9c73cb322e
replaced bitfield with LUT
2022-07-20 10:48:09 -07:00
Eduardo Quezada D'Ottone
0f3fdd410a
Config for Sturdy's Gen5+ effect.
2022-07-20 13:06:41 -04:00
Eduardo Quezada D'Ottone
f00beac3f9
Updated Z-Move power for Gen 8 moves and moves with power varying by Gen
2022-07-20 11:32:16 -04:00
Eduardo Quezada D'Ottone
e14afd8957
Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5.
2022-07-20 10:33:18 -04:00
Eduardo Quezada D'Ottone
cb34119711
Config for Charge raising Sp. Def.
2022-07-20 10:13:18 -04:00
Eduardo Quezada D'Ottone
fe63dafcc1
Merge branch 'battle_engine' into BE_pretmerge
...
# Conflicts:
# src/battle_anim_fire.c
# src/battle_controller_player.c
2022-07-20 08:50:30 -04:00
Eduardo Quezada D'Ottone
9d1c0a7597
Merge pull request #2190 from ghoulslash/be/zmoves
...
Z Moves for real
2022-07-19 19:17:04 -04:00
ghoulslash
99424e1aaf
Update include/battle.h
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-07-19 19:03:05 -04:00
ghoulslash
2b5bb9f6e4
move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check
2022-07-19 18:24:53 -04:00
Eduardo Quezada D'Ottone
64115a873f
Comatose prevents Battle Pike's status effects.
2022-07-18 18:15:44 -04:00
Eduardo Quezada D'Ottone
1cfb267b34
Config for Explosion halving defense
2022-07-18 13:10:27 -04:00
ghoulslash
f2ee9f3ba0
tweak z indicator position relative to healthbox
2022-07-18 09:44:04 -04:00
Eduardo Quezada D'Ottone
e55fea47f3
Added missing MOVE_UNAVAILABLE to Gorilla Tactics check
2022-07-18 09:24:08 -04:00
ghoulslash
18affe8c1a
new z move indicator, credits to blackforest
2022-07-18 09:21:59 -04:00
Eduardo Quezada D'Ottone
1dcbf59686
Config for Plus and Minus interaction
2022-07-18 08:11:02 -04:00
Eduardo Quezada D'Ottone
e40fe3308c
Merge pull request #2191 from sphericalice/patch-1
...
Give Pikachu its typing back
2022-07-18 07:52:49 -04:00
sphericalice
65db9238e8
Give Pikachu its typing back
2022-07-18 09:41:04 +01:00
GriffinR
a8c93dcf35
Add missing font constants after EXT_CTRL_CODE_FONT
2022-07-18 02:36:25 -04:00
ghoulslash
f6b6ab56be
some style fixes
2022-07-17 19:16:13 -04:00
ghoulslash
5d91bdeafc
add B_ANIM_RESTORE_BG to BattleScript_EffectTerrainHit
2022-07-17 19:13:45 -04:00
ghoulslash
6b84a9f0b3
merge w be
2022-07-17 12:40:43 -04:00
ghoulslash
9b5aee3b93
fix z stat-boosts
2022-07-17 12:17:54 -04:00
GriffinR
165f51a295
Merge pull request #1701 from GriffinRichards/faint-cmd-name
...
Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall
2022-07-16 08:15:54 -04:00
ExpoSeed
da4d1bc626
Merge pull request #2176 from LOuroboros/patch-1
...
Fixed Pokéblock Case's description
2022-07-16 03:35:26 -05:00
ExpoSeed
93c4cf7e3c
Merge pull request #2180 from LOuroboros/patch-2
...
Updated the Casteliacone's name
2022-07-16 03:29:49 -05:00
ExpoSeed
61f2011b36
Merge pull request #2187 from LOuroboros/patch-4
...
Updated Cmd_handleballthrow
2022-07-16 03:26:10 -05:00
LOuroboros
0651cc9fe4
Updated Cmd_handleballthrow
2022-07-16 05:09:32 -03:00
