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 |
|
LOuroboros
|
b6e2945072
|
Merge branch 'master' of https://github.com/pret/pokeemerald into bePret
|
2022-04-11 01:22:10 -03: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 |
|
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 |
|
GriffinR
|
d664135572
|
Add usage of battle strings table offset constant
|
2022-03-10 10:44:04 -05: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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|