Commit Graph

11028 Commits

Author SHA1 Message Date
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
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
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
GriffinR
8898d84ced
Merge pull request #1708 from LOuroboros/sStartMenuItems
Linked MENU_ACTION constants to the items in sStartMenuItems
2022-07-15 09:22:35 -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
26e03dcda8 Linked MENU_ACTION constants to the items in sStartMenuItems 2022-07-15 04:45:05 -03:00
LOuroboros
cec7e30ef1
Update battle_moves.h 2022-07-15 01:51:36 -03:00
GriffinR
16ab534ddb Add some missing pocket constant usage 2022-07-14 10:27:51 -04:00
GriffinR
f85b4699dc Fix conditional in SpriteCB_DeoxysRockFragment 2022-07-12 21:29:36 -04:00
Eduardo Quezada D'Ottone
f78bb4fb84 Merge remote-tracking branch 'pret/master' into item_expansion
# Conflicts:
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
2022-07-12 17:42:32 -04:00
Eduardo Quezada D'Ottone
c69275f373 Merge remote-tracking branch 'pret/master' into PE_pretmerge
# Conflicts:
#	include/battle_anim.h
#	include/pokemon.h
#	src/data/pokemon/base_stats.h
2022-07-12 17:20:49 -04: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
Greenphx9
4294682d8c 16-letter move names
Move define, add spaces between comments, fix include
if TRUE -> if set to TRUE

Co-Authored-By: LOuroboros <lunosouroboros@gmail.com>
2022-07-11 12:49:30 +10:00
LOuroboros
a1004485c5 Relocated TYPE_NAME_LENGTH and ABILITY_NAME_LENGTH 2022-07-10 20:08:28 -03:00
GriffinR
15f386ede6
Move make compare to its own build section 2022-07-08 01:34:38 -04:00
GriffinR
06dc93fc2f Clean up field_poison.c 2022-07-06 21:04:54 -04:00
GriffinR
2c4c9497d2 Fix comment 2022-07-06 15:02:17 -04:00
GriffinR
e6a374f2b6 Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall 2022-07-06 14:49:08 -04:00