LOuroboros
032b7b2ab9
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into yourAffection
2022-07-25 10:24:19 -03:00
ghoulslash
57e2de092b
Merge pull request #2210 from LOuroboros/prankster
...
Corrected usage of B_PRANKSTER_DARK_TYPES in AI_CheckBadMove
2022-07-24 07:29:03 -04:00
LOuroboros
f1d8d006f3
Corrected usage of B_PRANKSTER_DARK_TYPES in AI_CheckBadMove
2022-07-24 06:47:50 -03:00
ghoulslash
3a77b52bad
Merge pull request #2194 from AsparagusEduardo/BE_pretmerge
...
Battle Engine pret merge
2022-07-22 14:00:40 -04: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
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
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
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
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
Eduardo Quezada D'Ottone
e791cf90ad
Merge tag 'pretmaster' into BE_pretmerge2
...
# Conflicts:
# data/battle_anim_scripts.s
# include/battle_anim.h
# include/battle_controllers.h
# include/battle_interface.h
# include/battle_main.h
# include/battle_setup.h
# include/constants/battle_anim.h
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_anim_fire.c
# src/battle_anim_normal.c
# src/battle_controllers.c
# src/battle_dome.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/pokemon.c
2022-07-15 12:58:46 -04:00
Eduardo Quezada D'Ottone
6cb483bc9b
Merge pull request #2185 from LOuroboros/patch-3
...
Updated MOVE_ROUND's move flags
2022-07-15 08:20:55 -04:00
LOuroboros
cec7e30ef1
Update battle_moves.h
2022-07-15 01:51:36 -03:00
GriffinR
30a5821997
Merge pull request #1705 from sphericalice/move-unavailable
...
Introduces a MOVE_UNAVAILABLE constant
2022-07-12 11:32:57 -04:00
GriffinR
a359db6a8c
Merge pull request #1704 from LOuroboros/typeAbNameLength
...
Relocated TYPE_NAME_LENGTH and ABILITY_NAME_LENGTH
2022-07-11 22:49:29 -04:00
sphericalice
167353223c
Use MAX_MON_MOVES in Cmd_trysetencore
2022-07-11 15:23:23 +01:00
sphericalice
186f2c0232
Introduce a MOVE_UNAVAILABLE constant
2022-07-11 15:18:13 +01:00
LOuroboros
a1004485c5
Relocated TYPE_NAME_LENGTH and ABILITY_NAME_LENGTH
2022-07-10 20:08:28 -03:00
