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
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
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
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
LOuroboros
c04f7d5e5b
Changed B_TELEPORT_BEHAVIOR's description comment
2022-07-03 13:51:34 -03:00
LOuroboros
8f728dcd79
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport
2022-07-03 13:49:18 -03:00
Blackforest92
8c88e8a9b7
Legends Arceus Pokemon 95% Finished
2022-07-03 17:15:37 +07: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
LOuroboros
aa5c6a3f01
Implemented affection-now-friendship mechanics
2022-06-22 00:18:01 -03: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
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
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
sneed
2e855b204a
ai accounts for a third type
2022-05-29 04:55:37 +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
BuffelSaft
16570e8c3f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2022-05-22 12:55:55 +12:00
Sneed69
d0a2be9630
weather forms fixes and config
2022-05-22 03:20:48 +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
BuffelSaft
bb25746e05
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2022-05-13 22:40:43 +12:00
LOuroboros
52d6c96e69
Merge branch 'master' of https://github.com/pret/pokeemerald into pePretMerge
2022-05-13 03:20:42 -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
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
sneed
f83875cf0f
remove item expansion check
2022-05-07 23:34:38 +03:00
AgustinGDLV
7b0154336d
Merge branch 'battle_engine' into symbiosis
2022-05-07 13:26:21 -07:00
AgustinGDLV
c7bee35161
fixed conflict with new PR
2022-05-07 13:23:41 -07:00
AgustinGDLV
9d222d3ab4
fixed gems and damage-reducing berries
2022-05-07 13:12:21 -07: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
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
AgustinGDLV
542a0f07b4
fixed bug bite / bestow
2022-05-06 22:07:25 -07:00
BuffelSaft
57003c62fd
EFFECT_SOLAR_BEAM
...
Fix definition.
2022-05-07 14:20:56 +12:00
BuffelSaft
3e1934ebe3
Rework VARIOUS_IS_PARENTAL_BOND_LAST_STRIKE
...
Make this more versatile by allowing it to check parentalBondOn instead of only checking if parentalBondOn == 2. Also, fix Dragon Tail/Circle Throw switching the target on the first hit.
2022-05-07 14:20:37 +12:00
BuffelSaft
8693db632b
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2022-05-07 12:27:20 +12:00
LOuroboros
43053d2e6c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport
2022-05-06 02:22:14 -03: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
sneed
60d7d8f97e
Initial Commit
2022-05-03 03:38:44 +03:00
sneed
b17d1f7816
Add generation specific interactions
2022-05-02 17:56:09 +03:00
Eduardo Quezada D'Ottone
cb9cace04f
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE_KadabraEverstone
...
# Conflicts:
# include/constants/pokemon_config.h
2022-04-27 12:05:33 -04:00
BuffelSaft
af6242f2e0
Requested changes, Sticky Web edge case
...
Fix issues found by ghoulslash, and make sure Defiant works properly with Sticky Web and Court Change.
2022-04-27 21:51:10 +12:00
BuffelSaft
5358cc0a00
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2022-04-25 13:38:13 +12:00
GriffinR
fc5747f0f7
Merge pull request #1649 from GriffinRichards/clean-trainer
...
Trainer hill clean up
2022-04-20 00:20:44 -04:00
TheXaman
c54bf21b01
Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system
2022-04-16 23:18:35 +02:00
Eduardo Quezada D'Ottone
a6175d2622
Config for Legendaries, Mythicals and Ultra Beasts to have at least 3 perfect IVs
2022-04-16 13:01:15 -04:00
Eduardo Quezada D'Ottone
84d713a50f
Legendary and Mythical flags
2022-04-14 18:44:20 -04:00
TheXaman
2fa812df26
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into rhh_master_merge
2022-04-13 20:51:35 +02:00
LOuroboros
446bcd3181
Merge branch 'master' of https://github.com/pret/pokeemerald into pePret
2022-04-11 01:23:18 -03:00
LOuroboros
eb1834ce84
Merge branch 'master' of https://github.com/pret/pokeemerald into iePret
2022-04-11 01:22:48 -03:00
LOuroboros
b6e2945072
Merge branch 'master' of https://github.com/pret/pokeemerald into bePret
2022-04-11 01:22:10 -03:00
LOuroboros
3ca9ac5b37
Post merge corrections
2022-04-03 14:27:33 -03:00
LOuroboros
f82c946ff3
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge
2022-04-03 13:26:27 -03:00
LOuroboros
af2f70e000
Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge
2022-04-03 13:21:40 -03:00
LOuroboros
fa39dc76dc
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
GriffinR
62f3f144ab
Clean up some trainer hill
2022-03-31 12:54:07 -04:00
LOuroboros
434f6cf5ad
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
2022-03-26 08:43:55 -03:00
ExpoSeed
f50a406b18
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2022-03-22 12:56:23 -05:00
ghoulslash
0036a4dc36
pc acccess
2022-03-18 13:30:08 -04:00
GriffinR
5160520639
Merge pull request #1642 from GriffinRichards/bstrings
...
Add usage of battle strings table offset constant
2022-03-14 16:40:54 -04:00
Eduardo Quezada D'Ottone
ff9556cb44
Update include/constants/pokedex.h
2022-03-13 11:25:44 -03:00
Eduardo Quezada D'Ottone
8f34249ab2
Update include/constants/pokedex.h
2022-03-13 11:25:37 -03:00
GriffinR
d664135572
Add usage of battle strings table offset constant
2022-03-10 10:44:04 -05:00
ultima-soul
2d3ba500c9
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2022-03-01 15:10:19 -08:00
ultima-soul
84a7f960c8
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2022-02-28 23:37:41 -08:00
ultima-soul
86089ce935
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2022-02-28 22:13:14 -08:00
GriffinR
5d58cdd297
Fix bunny hoppy typo
2022-02-28 13:34:39 -05:00
Eduardo Quezada D'Ottone
054f667446
Config for Kadabra ignoring Everstone upon evolving
2022-02-26 22:04:24 -03:00
Eduardo Quezada D'Ottone
755b31bee0
Enable form change for the Forces of Nature
2022-02-26 12:19:38 -03:00
BuffelSaft
6a119c5a30
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2022-02-13 21:06:15 +13:00
Eduardo Quezada D'Ottone
dde65d5cea
Config for Sheer Cold being less accurate when not used by Ice type Pokémon
2022-02-13 01:07:42 -03:00
Eduardo Quezada D'Ottone
c849197a88
Config for Minimize raising 2 stages
2022-02-13 00:45:35 -03:00
Eduardo Quezada D'Ottone
d73e6faab8
Config for Growth being affected by sunlight
2022-02-13 00:30:37 -03:00
Eduardo Quezada D'Ottone
748ce99de3
Config for Ingrain grounding the user
2022-02-13 00:17:37 -03:00
Eduardo Quezada D'Ottone
76e0b38960
Config for Pokémon with Oblivious being affected by Taunt
2022-02-12 23:57:23 -03:00
Eduardo Quezada D'Ottone
389a38b3cd
Config for Facade being affected by burns
2022-02-12 23:55:54 -03:00
Eduardo Quezada D'Ottone
0dd2de988a
Merge branch 'battle_engine' into primalReversionTweaks
2022-02-12 23:08:12 -03:00
LOuroboros
92d8268603
Update include/constants/battle_config.h
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-02-12 00:18:24 -03:00
LOuroboros
b52233ec31
Updated Conversion's effect
2022-02-11 21:42:39 -03:00
GriffinR
7d2344c07b
Merge pull request #1616 from GriffinRichards/missing-req
...
Add missing :req, remove old macros
2022-02-02 22:09:36 -05:00
BuffelSaft
9d1800f53e
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2022-01-27 17:18:51 +13:00
GriffinR
2495d18132
Add missing :req, remove old macros
2022-01-23 18:52:04 -05:00
ghoulslash
bc94a2bb16
Merge pull request #1979 from AsparagusEduardo/BE_wildNaturalEnemies
...
Wild mon natural enemies in double wild battles
2022-01-23 18:43:12 -05:00
LOuroboros
8eaf0718ec
Review changes
...
Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.
2022-01-23 19:13:04 -03:00
LOuroboros
a8a8c7e2fa
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
2022-01-23 02:37:07 -03:00
Eduardo Quezada D'Ottone
e880e4afdd
Merge branch 'battle_engine' into be_recalc_turn_order_after_actions
2022-01-22 19:01:45 -03:00
GriffinR
c4f33f2b2b
TRAVERSABLE->UNUSED, rename MB_SECRET_BASE_OBSTACLE
2022-01-19 12:54:55 -05:00
GriffinR
e682c12519
sTileBitAttributes to sparse array, rename MB_UNNUSED_CAVE
2022-01-19 12:39:11 -05:00
GriffinR
8200fda14e
Fix decorations metatile attribute names
2022-01-19 10:56:54 -05:00
Eduardo Quezada D'Ottone
925f65c450
Realigned config to previous state
2022-01-16 21:10:09 -03:00
GriffinR
69759b2d12
Merge pull request #1601 from GriffinRichards/fix-decor-flag
...
Fix FLAG_DECORATION_0 name
2022-01-16 17:44:58 -05:00
Eduardo Quezada D'Ottone
02da6cc627
Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb
...
# Conflicts:
# include/graphics.h
# src/data/graphics/items.h
# src/data/item_icon_table.h
# src/data/items.h
# src/data/text/item_descriptions.h
2022-01-16 18:44:03 -03:00
Eduardo Quezada D'Ottone
d40119010e
Merge branch 'BattleEngine' into BE_wildNaturalEnemies
...
# Conflicts:
# include/constants/battle_config.h
2022-01-16 16:23:12 -03:00
Eduardo Quezada D'Ottone
6aabe58649
Merge branch 'battle_engine' into magician
2022-01-15 13:06:13 -03:00
Eduardo Quezada D'Ottone
b86694876c
Merge pull request #1508 from Scott-Bonner/get_ability
...
Handle GetAbilityBySpecies edge cases
2022-01-15 12:56:50 -03:00
ghoulslash
a0aaad2856
Merge pull request #2016 from AsparagusEduardo/PE_genderDiff
...
Optimized SpeciesHasGenderDifference into Base Stat flag
2022-01-13 11:55:29 -05:00
ghoulslash
46c2a9ada5
Merge pull request #2033 from LOuroboros/galarianZenMode
...
Allow Galarian Darmanitan's Zen Mode to work
2022-01-13 11:42:54 -05:00
ghoulslash
543252bc6c
Merge pull request #2034 from LOuroboros/proteanMsgboxFlush
...
Tweaked Protean's effect's InGame appearance
2022-01-13 11:42:31 -05:00
LOuroboros
a4f0de5106
Removed the last bits of HOLD_EFFECT_GRACIDEA
2022-01-12 01:54:29 -03:00
LOuroboros
b2965e5522
Added a pause to BattleScript_ProteanActivates
2022-01-11 20:15:47 -03:00
LOuroboros
24b5a5709a
Allow Galarian Darmanitan's Zen Mode to work
2022-01-10 23:01:18 -03:00
GriffinR
4024b3f1b3
Merge pull request #1590 from GriffinRichards/dex-enum
...
Convert pokedex defines to enums
2022-01-10 14:56:26 -05:00
GriffinR
8b920691e6
Fix FLAG_DECORATION_0 name
2022-01-09 01:31:42 -05:00
LOuroboros
5281fe63fc
Update NUM_TECHNICAL_MACHINES
2022-01-08 21:27:29 -03:00
Eduardo Quezada D'Ottone
97baedbd5e
Merge pull request #1923 from WiserVisor/battle_engine
...
Added Sky Drop to Battle Engine
2022-01-07 18:14:40 -03:00
GriffinR
577e6cc740
Merge pull request #1586 from GriffinRichards/clean-areascreen
...
Clean up pokedex_area_screen
2022-01-06 23:02:23 -05:00
GriffinR
5d033c2e4d
Convert pokedex defines to enums
2022-01-05 12:18:49 -05:00
TheXaman
44a6c4c0ec
changed EGG_MOVES_ARRAY_COUN to 19 to include all the added egg moves (19 is max value (Buneary))
2022-01-04 00:23:24 +01:00
Eduardo Quezada D'Ottone
221e38ff86
Merge pull request #1957 from ghoulslash/be/ability_popup
...
Ability Popup Fixes + Longer Ability Names config
2022-01-01 19:39:55 -03:00
Eduardo Quezada D'Ottone
3bbaf5a15d
Optimized SpeciesHasGenderDifference into Base Stat flag
2022-01-01 19:24:34 -03:00
Eduardo Quezada D'Ottone
b25c89f8a1
Removed Redundant Key Stone item
2021-12-31 18:22:23 -03:00
LOuroboros
9b1fd796ae
Gave the Gracidea's old hold effect slot to the Enigma Berry
2021-12-31 18:07:33 -03:00
Eduardo Quezada D'Ottone
313df31e7e
Removed Jade Orb, since it has no use besides being a key-lock item.
2021-12-31 17:44:03 -03:00
LOuroboros
0c5652596b
Removed HOLD_EFFECT_GRACIDEA
2021-12-31 17:34:16 -03:00
GriffinR
23f5c9fd5c
Clean up pokedex_area_screen
2021-12-31 00:16:56 -05:00
Eduardo Quezada D'Ottone
5b54986e6b
Merge pull request #1980 from LOuroboros/multiBattles
...
Multi battle updates
2021-12-29 22:09:06 -03:00
GriffinR
aadab8b016
Move pokemon and easy chat constants to global, misc clean-up
2021-12-28 18:07:41 -05:00
LOuroboros
ce7815ebcc
Update pokemon.h
2021-12-28 15:11:52 -03:00
Eduardo Quezada D'Ottone
7bffe6d1d5
Merge pull request #2004 from ghoulslash/be/sports
...
Add sport effects back
2021-12-24 18:59:50 -03:00
ghoulslash
93a7e139ec
merge w be
2021-12-24 09:40:12 -05:00
Eduardo Quezada D'Ottone
2ebe427a42
Merge branch 'BattleEngine' into BE_wildNaturalEnemies
...
# Conflicts:
# src/battle_controller_opponent.c
2021-12-23 21:19:59 -03:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine
2021-12-23 15:29:10 -08:00
Eduardo Quezada D'Ottone
67697d2de3
Merge pull request #1582 from ghoulslash/smart_wild_ai
...
Smart Wild AI Option
2021-12-23 20:18:18 -03:00
LOuroboros
713d97891f
Update include/constants/battle_config.h
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-12-22 21:32:10 -03:00
ghoulslash
2736223b1b
Merge pull request #1698 from AsparagusEduardo/PE_FormChangeHoldItems
...
Form changing by holding items
2021-12-21 09:10:23 -05:00
ghoulslash
b4cc5e3cd8
Merge pull request #1952 from AsparagusEduardo/PE_natureEvo
...
Added Nature evolution methods
2021-12-20 14:08:47 -05:00
ghoulslash
05f91bc243
Update include/constants/battle_config.h
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-12-20 14:06:32 -05:00
ghoulslash
02fe96cc08
fix config settings
2021-12-20 13:06:23 -05:00
LOuroboros
cb44de13b3
B_NEW_MULTI_BATTLE_DEFEAT_CONDITION -> B_MULTI_BATTLE_WHITEOUT
2021-12-19 20:53:57 -03:00
Eduardo Quezada D'Ottone
4ab4250d5d
Merge branch 'battle_engine' into be/sports
2021-12-19 20:42:15 -03:00
Eduardo Quezada D'Ottone
8b49f8f925
Merge branch 'pokemon_expansion' into PE_FormChangeHoldItems
2021-12-19 12:08:52 -03:00
LOuroboros
ffe35fbb06
Updated defeat condition on multi battles
2021-12-19 08:30:43 -03:00
ultima-soul
18afd06f6d
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-18 00:28:18 -08:00
ultima-soul
b0b8b9bf46
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 23:51:29 -08:00
ultima-soul
4f2e3bf214
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 21:23:54 -08:00
ExpoSeed
d6747527da
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-12-16 21:44:01 -06:00
TheXaman
fe95e88938
added option to view changes for front/back sprite picCoords and elevation live
2021-12-13 22:31:37 +01:00
TheXaman
f1f4082f62
added footprints
2021-12-13 19:24:19 +01:00
TheXaman
123969f093
fixed front sprite position including elevation and shadow for flying mon's (shadow palette too dark atm)
2021-12-13 15:05:17 +01:00
Eduardo Quezada D'Ottone
7ca07527fa
Config for HP bars moving faster for higher HP amounts. Credit to Dat.H
2021-12-12 12:33:49 -03:00
Eduardo Quezada D'Ottone
bbf7b62ceb
Config for lost money after losing a battle
2021-12-11 23:03:50 -03:00
LOuroboros
f317b542e2
Updated Teleport
2021-12-11 21:20:04 -03:00
TheXaman
51371661c2
Added new menu naviagtion, now all options can be changed
2021-12-11 15:03:56 +01:00
TheXaman
bbe918941e
added include/constants/pokemon_debug,h for defines, restructured code order
2021-12-11 12:13:14 +01:00
ultima-soul
26f29a04fd
Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync"
...
This reverts commit ac2bcece75349262ebc3
2021-12-10 09:41:54 -08:00
TheXaman
f6d9b74a1a
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into pokemon_expansion_debug
2021-12-10 16:48:46 +01:00
Eduardo Quezada D'Ottone
aa2b2e6a70
Merge pull request #1929 from ultima-soul/battle_engine_sync
...
Battle Engine Upstream Sync
2021-12-09 20:02:45 -03:00
ultima-soul
ac2bcece75
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync
2021-12-09 14:16:05 -08:00
ultima-soul
a5afdac0ae
Resolved review suggestions for upstream Battle Engine sync.
2021-12-08 12:08:16 -08:00
DizzyEggg
97539d7443
Merge pull request #1951 from ghoulslash/be/sheercold
...
Ice Types immune to Sheer Cold
2021-12-06 14:12:06 +01:00
ghoulslash
c0e408bfab
fix aqua ring heal anim
2021-12-05 14:44:22 -05:00
Eduardo Quezada D'Ottone
1708ac4b1b
Wild mon that have a natural enemy or preys on other mon will attack them whem partnered in double wild battles.
2021-12-04 22:13:29 -03:00
ultima-soul
349262ebc3
Merge remote-tracking branch 'rhh/item_expansion' into item_expansion_sync
2021-12-03 17:31:02 -08:00
ultima-soul
7369f60c06
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
2021-12-03 17:30:45 -08:00
TheXaman
40f7247e11
changed P_ENABLE_DEBUG to TRUE/FALSE
2021-12-03 11:02:22 +01:00
TheXaman
bf0d2b8393
Changed definition of P_ENABLE_DEBUG to pokemon_config.h
2021-12-02 19:29:04 +01:00
ultima-soul
d408b56549
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-12-01 20:18:57 -08:00
ultima-soul
a68a39e35f
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-12-01 20:17:49 -08:00
ultima-soul
23bf41713c
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-12-01 20:17:08 -08:00
LOuroboros
2e67153982
Renamed the Enigma Berries' constants
2021-12-01 22:16:38 -03:00
