Eduardo Quezada
|
e96c9c87fa
|
Merge remote-tracking branch 'RHH/item_expansion' into RHH_masterMerge
# Conflicts:
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
|
2022-07-22 23:38:52 -04:00 |
|
Eduardo Quezada
|
231727d02b
|
Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge
# Conflicts:
# asm/macros/event.inc
# data/specials.inc
# include/constants/species.h
# src/data/pokemon/base_stats.h
|
2022-07-22 23:33:04 -04:00 |
|
Eduardo Quezada
|
f3bebcd12c
|
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
# Conflicts:
# include/battle_anim.h
# include/global.h
# include/pokemon.h
# src/battle_message.c
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
|
2022-07-22 22:57:02 -04:00 |
|
ghoulslash
|
1260666c91
|
Merge pull request #1911 from AsparagusEduardo/PE_breedOverrides
Added Egg breeding species overrides.
|
2022-07-22 14:05:14 -04:00 |
|
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 |
|
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 |
|
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
|
06dc93fc2f
|
Clean up field_poison.c
|
2022-07-06 21:04:54 -04: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
|
fc2cfd8c9d
|
Merge pull request #2136 from LOuroboros/pePretMerge
Pret merge for the pokemon_expansion
|
2022-07-01 09:22:55 -04: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 |
|
sneed
|
ce468a0903
|
add macros for handling form base stats
|
2022-05-23 01:04:21 +03:00 |
|
Eduardo Quezada D'Ottone
|
f2c509eab7
|
Merge pull request #2151 from Sneed69/dummy_abilities
Add dummy abilities to make base stats header smaller
|
2022-05-22 13:27:27 -04:00 |
|
sneed
|
587b056ccb
|
add dummy abilities to PE
|
2022-05-22 19:55:09 +03: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 |
|
GriffinR
|
593e2c9be0
|
Fix inconsistent static s/g names
|
2022-05-17 14:00:02 -04:00 |
|
LOuroboros
|
74265efe61
|
Corrected size value of trainerHillTimes
|
2022-05-13 10:55:53 -03:00 |
|
LOuroboros
|
577791a6bc
|
Moved order of defined header files in include/global.h
|
2022-05-13 10:52:09 -03:00 |
|
LOuroboros
|
1d75f3ffde
|
Moved order of defined header files in include/global.h
|
2022-05-13 10:51:49 -03:00 |
|
LOuroboros
|
5397d020d7
|
Moved order of defined header files in include/global.h
|
2022-05-13 10:51:13 -03:00 |
|
LOuroboros
|
08225bbba9
|
Post Pret merge fix
I made an oopsie.
|
2022-05-13 10:46:08 -03:00 |
|
LOuroboros
|
52d6c96e69
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pePretMerge
|
2022-05-13 03:20:42 -03:00 |
|
LOuroboros
|
12d956872b
|
Merge branch 'master' of https://github.com/pret/pokeemerald into iePretMerge
|
2022-05-13 03:18:37 -03:00 |
|
LOuroboros
|
2263caef7a
|
Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine
|
2022-05-13 03:17:31 -03:00 |
|
sneed
|
bceccf5474
|
changes
|
2022-05-10 08:17:31 +03:00 |
|
sneed
|
709f583390
|
Initial commit
|
2022-05-10 02:58:24 +03:00 |
|
Eduardo Quezada D'Ottone
|
f80bab897f
|
Merge pull request #2112 from AgustinGDLV/evo_battle
Gen 8 Evolution Mechanics (Battle Engine)
|
2022-05-09 17:40:19 -04:00 |
|
Eduardo Quezada D'Ottone
|
b6922a1dab
|
Merge branch 'pokemon_expansion' into evo_overworld
|
2022-05-09 16:36:34 -04:00 |
|
AgustinGDLV
|
9bb5db2275
|
removed duplicate define
|
2022-05-08 21:23:51 -07:00 |
|
ghoulslash
|
07b0ce9737
|
add inner focus ability popup msg
|
2022-05-08 17:57:30 -04:00 |
|
Eduardo Quezada D'Ottone
|
13f9919b9e
|
Merge pull request #2123 from Sneed69/wikiberry_battle
Update Confuse Berry Hold Effect (Battle Engine)
|
2022-05-08 09:02:33 -04:00 |
|
Eduardo Quezada D'Ottone
|
c71b60d9f8
|
Merge branch 'PokemonExpansion' into PE_breedOverrides
# Conflicts:
# include/constants/pokemon_config.h
|
2022-05-07 19:45:06 -04:00 |
|
Eduardo Quezada D'Ottone
|
989ec641f4
|
Merge pull request #2120 from ghoulslash/be/healblock
Heal Block AI and Pollen Puff Selection Prevention
|
2022-05-07 19:29:24 -04:00 |
|
sneed
|
f83875cf0f
|
remove item expansion check
|
2022-05-07 23:34:38 +03:00 |
|
sneed
|
c6b529ed50
|
add missing constant
|
2022-05-07 22:09:08 +03:00 |
|
AgustinGDLV
|
8a0a2a5a39
|
Apply suggestions from code review
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2022-05-07 09:36:03 -07:00 |
|
AgustinGDLV
|
017f44f5ac
|
Apply suggestions from code review
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2022-05-07 09:35:00 -07:00 |
|
ghoulslash
|
0172f84617
|
Merge pull request #2070 from AsparagusEduardo/PE_evoData
Updated missing evolution and form change data
|
2022-05-07 11:37:11 -04:00 |
|
ghoulslash
|
9fa4d916d3
|
Merge pull request #2055 from AsparagusEduardo/BE_configs
Once again, Battle Configs
|
2022-05-07 11:31:25 -04:00 |
|
Eduardo Quezada D'Ottone
|
dc25bc6145
|
Merge branch 'battle_engine' into BE_WhiteOutMoney
# Conflicts:
# include/constants/battle_string_ids.h
# src/battle_message.c
|
2022-05-07 11:16:34 -04:00 |
|
Eduardo Quezada D'Ottone
|
cbe73de8c8
|
Merge pull request #1861 from LOuroboros/primalReversionTweaks
Primal Reversion Tweaks
|
2022-05-07 11:04:23 -04:00 |
|
Eduardo Quezada D'Ottone
|
096fe3c11d
|
Removed unecessary B_LEEK_ALWAYS_CRIT config
|
2022-05-07 10:56:31 -04:00 |
|
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 |
|
sneed
|
ef7cd3cdfe
|
BattleScript_DefiantActivates rename
|
2022-05-06 11:15:24 +03:00 |
|
AgustinGDLV
|
e730d64945
|
corrections
|
2022-05-05 15:54:33 -07:00 |
|
AgustinGDLV
|
03c48b4f3f
|
compatibility with evo_battle
|
2022-05-05 15:46:53 -07:00 |
|
AgustinGDLV
|
7d42f93861
|
added special overworld evo changes
|
2022-05-05 11:55:31 -07:00 |
|
AgustinGDLV
|
6235970722
|
added special battle evo changes
|
2022-05-05 11:41:27 -07:00 |
|
sneed
|
865b771db7
|
initial commit
|
2022-05-05 00:57:19 +03:00 |
|
Eduardo Quezada D'Ottone
|
49905cee04
|
Ability Patch
|
2022-05-03 14:14:04 -04:00 |
|