ghoulslash
|
3a77b52bad
|
Merge pull request #2194 from AsparagusEduardo/BE_pretmerge
Battle Engine pret merge
|
2022-07-22 14:00:40 -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
|
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 |
|
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
|
0f3fdd410a
|
Config for Sturdy's Gen5+ effect.
|
2022-07-20 13:06:41 -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 |
|
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 |
|
Eduardo Quezada D'Ottone
|
1dcbf59686
|
Config for Plus and Minus interaction
|
2022-07-18 08:11:02 -04:00 |
|
ghoulslash
|
6b84a9f0b3
|
merge w be
|
2022-07-17 12:40:43 -04: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
|
30a5821997
|
Merge pull request #1705 from sphericalice/move-unavailable
Introduces a MOVE_UNAVAILABLE constant
|
2022-07-12 11:32:57 -04: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 |
|
ghoulslash
|
fac6f21ed0
|
AI_EFFECTIVENESS_xY are enums
|
2022-07-03 16:28:34 -04:00 |
|
ghoulslash
|
e4bf99d777
|
merge w be
|
2022-07-03 16:20:05 -04:00 |
|
ghoulslash
|
02a62e245b
|
Merge pull request #1992 from AsparagusEduardo/BE_WhiteOutMoney
Config for lost money after losing a battle
|
2022-07-01 11:58:36 -04:00 |
|
ghoulslash
|
6cf0620f93
|
Merge pull request #2159 from Sneed69/trap-move-arrays
Trap move battle string related code cleanup
|
2022-07-01 11:07:28 -04:00 |
|
sneed
|
c1af418340
|
define B_MSG_WRAPPED_ constants
|
2022-07-01 17:52:46 +03:00 |
|
ghoulslash
|
a349462b78
|
Merge pull request #2134 from LOuroboros/bePretMerge
Pret merge for the battle_engine
|
2022-07-01 09:21:51 -04:00 |
|
ghoulslash
|
42f3cccdbe
|
Merge pull request #2154 from HamishSinclair/poltergeist
add poltergeist animation
|
2022-07-01 09:19:49 -04:00 |
|
ghoulslash
|
f4918222e8
|
Merge pull request #2156 from Sneed69/ai_3rd_type
Type effectivess related AI bugfixes
|
2022-07-01 09:09:12 -04:00 |
|
ghoulslash
|
80ac427443
|
Merge pull request #2160 from Sneed69/ignore-mystery-type-3
IS_BATTLER_OF_TYPE ignores third type if it's Mystery
|
2022-07-01 08:55:08 -04:00 |
|
GriffinR
|
57222323c1
|
Merge pull request #1678 from GriffinRichards/const-frontier
Add some battle frontier constant usage
|
2022-06-18 10:22:58 -04:00 |
|
GriffinR
|
4660f8c88b
|
Document battle tower TV show
|
2022-06-14 09:37:39 -04:00 |
|
GriffinR
|
7143865f6f
|
Add some battle frontier constant usage
|
2022-06-09 12:57:28 -04:00 |
|
GriffinR
|
1f540845cb
|
Merge pull request #1675 from GriffinRichards/doc-arg
Document generic arguments
|
2022-06-09 11:11:02 -04:00 |
|
ghoulslash
|
b33a8b0cb4
|
move ai score calc to STATE_TURN_START_RECORD so AI can consider move selection for item use
|
2022-06-05 11:09:04 -04:00 |
|
ghoulslash
|
c694e0cb90
|
merge w be
|
2022-06-05 08:22:24 -04:00 |
|
GriffinR
|
bc2dbd772e
|
Add warning to NUM_OBJ_EVENT_GFX
|
2022-06-03 16:18:34 -04:00 |
|
GriffinR
|
1ca1bff81c
|
Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg
|
2022-06-03 15:43:21 -04:00 |
|
GriffinR
|
34438e6bc4
|
Continue documenting generic arguments
|
2022-06-03 15:38:03 -04:00 |
|
Sneed69
|
c60de5055d
|
remove IsMoveWithoutAnimation
|
2022-06-03 17:42:42 +03:00 |
|
sphericalice
|
380cb46919
|
Correct CreateRegionMapPlayerIcon's argument names
Correct CreateRegionMapPlayerIcon's argument names in include/region_map.h
|
2022-06-03 15:04:52 +01:00 |
|
sneed
|
5934acbdc5
|
IS_BATTLER_OF_TYPE ignores 3rd type if mystery
|
2022-06-01 22:21:32 +03:00 |
|
sneed
|
86b436782a
|
trap move related code cleanup
|
2022-06-01 22:01:50 +03:00 |
|
GriffinR
|
a8437493c1
|
Document generic argument names in battle anim palettes
|
2022-06-01 12:25:01 -04:00 |
|
GriffinR
|
5e6d8a77e4
|
Document some generic argument names
|
2022-05-31 14:34:25 -04:00 |
|
sneed
|
2e855b204a
|
ai accounts for a third type
|
2022-05-29 04:55:37 +03:00 |
|
Martin Griffin
|
1cc59acca9
|
Static assertion for size of save structs
|
2022-05-25 19:48:42 +01:00 |
|
sneed
|
c8e08edbae
|
rename item1 and item2 in BaseStats
|
2022-05-23 19:10:24 +03:00 |
|
hamish
|
307d5d93c4
|
add potlergeist animation
|
2022-05-23 08:53:08 -04:00 |
|
GriffinR
|
6d772a5e30
|
Merge pull request #1662 from GriffinRichards/door-gfx
Clean up door animations
|
2022-05-21 16:07:02 -04:00 |
|
GriffinR
|
5c8e1e81ea
|
Color single-palette door anim graphics
|
2022-05-18 12:41:20 -04:00 |
|