ghoulslash
5509ceea04
expand move target field
2021-10-16 16:10:45 -04:00
BuffelSaft
df2223a5bc
Merge pull request #1745 from LOuroboros/retaliate
...
Implemented Retaliate's effect
2021-10-16 22:49:32 +13:00
LOuroboros
3b6ceb1dfa
Turned Retaliate into a side timer
2021-10-16 06:04:04 -03:00
ghoulslash
1f176242aa
add missing func definition
2021-10-15 16:06:50 -04:00
ghoulslash
c077091dbf
small fixes, check GetCatchingBattler's semi-invulnerability
2021-10-15 14:57:26 -04:00
ghoulslash
b94f710c80
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ballthrow
2021-10-15 14:49:37 -04:00
Eduardo Quezada D'Ottone
0a090616ef
Merge pull request #1765 from ghoulslash/shell_smash
...
Shell Smash Animation
2021-10-15 12:09:06 -03:00
ghoulslash
ef19c8c415
fix gen define
2021-10-15 09:22:50 -04:00
ghoulslash
883a249836
config for catching semi-invulnerable mons
2021-10-15 09:20:32 -04:00
LOuroboros
3a25bce185
Turned Retaliate's effect into a side status
2021-10-15 06:03:48 -03:00
LOuroboros
1f97198267
Oops, I forgot to take the opponent's side into account
2021-10-15 05:02:14 -03:00
Eduardo Quezada D'Ottone
21837b659a
Merge branch 'battle_engine' into bug_bite
2021-10-14 19:46:50 -03:00
ghoulslash
85ce72a4d0
add shell smash anim
2021-10-14 10:47:39 -04:00
BuffelSaft
fc6e8f598c
Merge branch 'battle_engine' into battle_bond
2021-10-14 16:24:59 +13:00
BuffelSaft
bb8d0e3d6b
Fix Battle Bond
...
Battle Bond Greninja transforms only after a KO, and doesn't revert when switched out.
2021-10-14 16:18:11 +13:00
Eduardo Quezada D'Ottone
d689842689
Merge pull request #1657 from ghoulslash/rototiller
...
Rototiller Fix + MOVE_TARGET_ALL_BATTLERS
2021-10-13 22:45:50 -03:00
ghoulslash
a3d2bdc9cf
merge with be
2021-10-13 18:30:53 -04:00
ghoulslash
3248bd796a
add quick draw
2021-10-12 21:49:18 -04:00
ghoulslash
996301d5d3
add mirror armor
2021-10-12 18:04:34 -04:00
ghoulslash
bbd09fdcf7
add wandering spirit
2021-10-12 10:32:51 -04:00
LOuroboros
6c550cd749
Implemented Retaliate's effect
2021-10-11 03:19:21 -03:00
ghoulslash
06bcfea3b8
merge with be
2021-10-10 19:56:33 -04:00
ghoulslash
fcada4fcad
handle rototiller + prankster
2021-10-10 19:54:17 -04:00
Eduardo Quezada D'Ottone
c3f8b77d82
Setting for pre-Gen6 Hidden Power Damage.
2021-10-10 20:26:38 -03:00
Eduardo Quezada D'Ottone
7798468ce9
Merge pull request #1738 from BuffelSaft/safety-googles
...
Fix Safety Googles
2021-10-10 18:34:20 -03:00
Eduardo Quezada D'Ottone
cf6e3873b4
Moved Electrified to Status4.
2021-10-10 01:13:23 -03:00
Eduardo Quezada D'Ottone
903c4cbf68
Config for Blizzard + Hail
2021-10-09 23:52:37 -03:00
Eduardo Quezada D'Ottone
004f705607
Merge pull request #1549 from ghoulslash/last_ball
...
add last used ball
2021-10-09 17:27:28 -03:00
LOuroboros
91a68cd5db
Implemented Primal Reversion
2021-10-09 00:36:41 -03:00
BuffelSaft
274e964d91
Fix Safety Googles
...
Fix typo and update gLastUsedItem before calling the safety goggles battle script.
2021-10-09 15:05:01 +13:00
BuffelSaft
fbc4d7584e
Merge pull request #1610 from LOuroboros/primalAbilities
...
Implement Desolate Land, Primordial Sea and Delta Stream
2021-10-08 20:01:09 +13:00
ghoulslash
4aeadd96c9
merge with be
2021-10-06 14:49:23 -04:00
ghoulslash
391cfabcac
merge with be
2021-10-06 14:31:21 -04:00
ghoulslash
ee3a2c97ee
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball
2021-10-06 13:54:40 -04:00
ghoulslash
1ad8448532
remove saveblock field
2021-10-06 13:54:33 -04:00
ghoulslash
4382420dd2
merge with be
2021-10-06 13:32:59 -04:00
ultima-soul
ce4375a10c
Ported new Ball catch rate modifier effects from Item Expansion.
2021-10-06 10:28:18 -07:00
ghoulslash
040e56b758
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_ai
2021-10-06 10:05:55 -04:00
ghoulslash
1f4844c7f5
Merge pull request #1710 from AsparagusEduardo/BE_Struggle
...
Implemented modern effect of struggle with config
2021-10-06 09:27:10 -04:00
ghoulslash
245ef1ad2d
Merge pull request #1715 from AsparagusEduardo/BE_ShadowTag
...
Config for Shadow Tag vs Shadow Tag
2021-10-06 09:02:58 -04:00
LOuroboros
2b32581c14
Fixed infinite loop
2021-10-06 09:27:33 -03:00
Eduardo Quezada D'Ottone
43d42c95cf
Terrain Pulse effect implemented
2021-10-04 22:45:37 -03:00
Eduardo Quezada D'Ottone
5019615be1
Refactored Secret Power move effect into a function
2021-10-04 21:28:15 -03:00
LOuroboros
b85b3094c8
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalAbilitiesDev
2021-10-03 07:05:56 -03:00
Eduardo Quezada D'Ottone
978f73475b
Config for Shadow Tag vs Shadow Tag
2021-10-02 19:01:11 -03:00
Eduardo Quezada D'Ottone
57ea20bc6d
Implemented modern effect of struggle with config
2021-10-02 13:32:36 -03:00
LOuroboros
c464b1b5dd
STRINGID_ATTACKERBECAMEASHGRENINJA -> STRINGID_ATTACKERBECAMEASHSPECIES
2021-10-01 23:12:59 -03:00
LOuroboros
f3ded43a88
Implemented Battle Bond
2021-10-01 22:49:17 -03:00
ghoulslash
e75a8fb67c
merge ai move and item decisions. AI will prefer to defeat player over healing
2021-09-27 21:03:27 -04:00
ghoulslash
761006a164
merge with be
2021-09-26 19:19:32 -04:00
LOuroboros
1b039062da
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile
2021-09-25 22:20:34 -03:00
Syreldar
4c05520bf3
Fixed Retaliate's naming.
2021-09-24 16:02:26 +02:00
Eduardo Quezada D'Ottone
e87c170db0
Merge branch 'BattleEngine' into booleanStandard
...
# Conflicts:
# src/battle_main.c
# src/battle_script_commands.c
2021-09-23 18:20:35 -03:00
ghoulslash
2f69748e0d
merge with be
2021-09-23 14:38:01 -04:00
ghoulslash
94ec25319f
syntax fixes. Use BlocksPrankster for perish song battle script
2021-09-23 14:35:37 -04:00
ghoulslash
768598b154
fix bad merge
2021-09-23 12:22:36 -04:00
ghoulslash
33972b5493
merge with be
2021-09-23 12:04:13 -04:00
ghoulslash
3f34fec42f
change last ball graphic based on config. replace saveblock field with ewram field
2021-09-23 12:03:01 -04:00
Eduardo Quezada D'Ottone
d084d2a68d
Merge branch 'BattleEngine' into booleanStandard
...
# Conflicts:
# include/battle.h
# src/battle_main.c
# src/battle_script_commands.c
2021-09-22 23:42:00 -03:00
Eduardo Quezada D'Ottone
075c0299a1
Better names for Micle and Custap flags
2021-09-22 23:29:26 -03:00
Eduardo Quezada D'Ottone
2c66aa84b6
Merge pull request #1378 from ghoulslash/gen8_move_effects
...
Several Gen 8 Move Effects
2021-09-22 22:48:29 -03:00
ghoulslash
9bf2ffe459
fix lash out stat fell
2021-09-22 21:15:02 -04:00
ghoulslash
d738297f24
merge with be
2021-09-22 16:26:09 -04:00
ghoulslash
3559a1b8e6
fix prankster + magic coat
2021-09-22 16:09:23 -04:00
ghoulslash
1309eea8ec
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_move_effects
2021-09-22 09:43:48 -04:00
ghoulslash
13062b5a8f
fix lash out, obstruct, and decorate
2021-09-22 09:43:40 -04:00
ghoulslash
fc84ebbd3e
redo prankster checks to handle assist
2021-09-22 08:06:42 -04:00
sbird
0ee13418dc
[ai] use expected value move dmg calculation
2021-09-22 13:15:43 +02:00
Eduardo Quezada D'Ottone
287ffff2e2
Merge branch 'battle_engine' into burmy-form-change
2021-09-21 22:34:37 -03:00
Eduardo Quezada D'Ottone
f338813c6a
Merge pull request #1538 from DizzyEggg/double_onemon_battles
...
Support for double battles with only one pokemon
2021-09-20 23:40:08 -03:00
ghoulslash
0ea6c65b83
merge with be
2021-09-17 09:10:09 -04:00
ghoulslash
faa963fd04
merge with be
2021-09-17 09:07:38 -04:00
ghoulslash
b916d7991c
merge with be
2021-09-16 21:52:29 -04:00
ghoulslash
e756b0accc
merge with be
2021-09-16 21:41:29 -04:00
ghoulslash
af8d86f0c9
merge with be
2021-09-16 13:33:35 -04:00
ghoulslash
c2e0990aab
fix some merge conflicts
2021-09-16 13:29:36 -04:00
ghoulslash
9d8672e3df
merge with be
2021-09-16 13:12:59 -04:00
ghoulslash
ac42b19de7
some formatting fixes
2021-09-16 11:54:27 -04:00
ghoulslash
aac7ae3595
add MOVE_TARGET_ALL_BATTLERS
2021-09-16 10:45:33 -04:00
ghoulslash
9c94eb6140
but it failed check for rototiller
2021-09-16 10:24:32 -04:00
ghoulslash
85f3982fb9
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into prankster
2021-09-15 17:52:45 -04:00
ghoulslash
f61d516aad
some syntax/format fixes
2021-09-15 17:15:50 -04:00
ghoulslash
845e333ba1
fix electric/misty terrain interactions with yawn/rest failures
2021-09-15 17:11:42 -04:00
ghoulslash
aa475ab300
merge with be
2021-09-15 16:42:23 -04:00
ghoulslash
0bca01cb74
mental herb fixes
2021-09-15 12:56:58 -04:00
ghoulslash
b85586a33a
merge with be
2021-09-15 12:54:39 -04:00
ghoulslash
c4ce4c150d
fix eject pack
2021-09-14 15:38:16 -04:00
ghoulslash
55c3e152cf
replace some BufferStatChange, fix room service and terrain seeds
2021-09-14 15:07:15 -04:00
ghoulslash
60713a8f2d
fix room service activation msg, stat target
2021-09-14 12:50:36 -04:00
ghoulslash
95af97593b
fix some comment styling. fix throat spray for multi-target moves
2021-09-14 11:53:35 -04:00
ghoulslash
f3f26d1a6f
merge with be
2021-09-13 19:40:28 -04:00
ghoulslash
6915b029bd
fix echoed voice power boost
2021-09-09 11:15:58 -04:00
ghoulslash
d7938bc2dc
Merge branch 'prankster' of github.com:ghoulslash/pokeemerald into prankster
2021-09-09 09:44:25 -04:00
ghoulslash
b8a71cabd1
merge with be
2021-09-09 09:44:18 -04:00
BuffelSaft
a4b630e6b5
Fix MOVE_EFFECT_REMOVE_STATUS
...
Wake-Up Slap and Sparkling Aria now print the correct message when the target is cured.
Also, fix Ice Hammer's effect chance.
2021-09-07 16:34:32 +12:00
DizzyEggg
68c33895fd
Merge pull request #1622 from BuffelSaft/money-boost
...
Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE
2021-09-06 11:32:53 +02:00
DizzyEggg
cdec3077b2
Merge pull request #1630 from BuffelSaft/disguise2
...
Fix many Disguise bugs
2021-09-06 10:32:37 +02:00
DizzyEggg
fa081d1fc5
Merge pull request #1618 from BuffelSaft/protect-like
...
Fix protect-like moves
2021-09-06 10:24:29 +02:00
BuffelSaft
bdbb4b5f7e
Fix many Disguise bugs
...
Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.
2021-09-06 18:27:42 +12:00
ghoulslash
933696b3cd
merge with be
2021-09-03 17:41:00 -04:00
ghoulslash
c7a587913b
replace statStages checks with CompareStat
2021-09-03 13:13:02 -04:00
ghoulslash
93e2e09148
fix terrain seeds. create generic CompareStat function
2021-09-03 12:17:38 -04:00
ghoulslash
6ce1227447
fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case
2021-09-03 11:05:11 -04:00
ghoulslash
7c53214dad
merge with be
2021-09-02 15:33:42 -04:00
ultima-soul
a10a02a536
Merge pull request #1221 from ghoulslash/battle_engine
...
Implement Pickpocket
2021-09-02 11:33:34 -07:00
BuffelSaft
13636f8691
Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE
...
moneyMultiplier should only ever be 1, 2 or 4. This adds some flags to moneyMultiplier that prevent HOLD_EFFECT_DOUBLE_PRIZE and Happy Hour from infinitely increasing it.
2021-09-02 16:15:58 +12:00
ghoulslash
dfe59992d3
merge with be
2021-09-01 07:37:45 -04:00
BuffelSaft
3371773e5c
Move touchedProtectLike to protect structs
...
This makes more sense than putting it in DisableStruct.
2021-09-01 21:34:47 +12:00
BuffelSaft
ea6ce80ad4
Fix protect-like moves
...
Make Protect-like moves (King's Shield etc.) activate only if the attacker would've touched the target.
This does not handle Sucker Punch, because that's not working correctly with Protect currently and will need to be addressed separately.
2021-09-01 19:57:03 +12:00
LOuroboros
d2bcc2ad5b
Added configs for modern post-battle stat calcs
2021-09-01 00:31:50 -03:00
LOuroboros
69b7910f47
Gave an entrance animation to Delta Stream
2021-08-31 00:15:17 -03:00
LOuroboros
0a38054925
Print STRINGID_ATTACKWEAKENEDBSTRONGWINDS properly
2021-08-30 21:21:07 -03:00
LOuroboros
216d8f0608
Solved game freezing issue
...
My approach with BattleScript_AttackWeakenedByStrongWinds was incorrect and thus caused the game to freeze when Battle Scene is enabled, so I resorted to printing the string directly, which I don't like because there is no pauses between `attackstring` and `STRINGID_ATTACKWEAKENEDBSTRONGWINDS`.
2021-08-27 18:28:34 -03:00
LOuroboros
9e4f33d09e
Implemented Desolate Land, Primordial Sea and Delta Stream
2021-08-27 17:56:43 -03:00
ultima-soul
b620349da0
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-16 15:43:27 -07:00
ghoulslash
a2d885c0d4
merge with be
2021-08-12 14:48:58 -06:00
ghoulslash
0bbbd1e7a9
fix electric/misty yawn/rest interactions
2021-08-12 14:08:41 -06:00
ghoulslash
c7c0fbc296
merge with be, make AI CanBeStatused functions separate from general util ones
2021-08-12 13:37:53 -06:00
ghoulslash
d218322b2c
merge with be
2021-08-12 01:26:13 -04:00
ultima-soul
02c9e040df
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-11 16:33:10 -07:00
GriffinR
80348e7188
Merge branch 'master' into doc-itemmenu2
2021-08-11 19:01:47 -04:00
GriffinR
cc51627465
Merge pull request #1489 from GriffinRichards/doc-playerpc
...
Document player pc
2021-08-11 18:59:58 -04:00
GriffinR
0bc26d9d79
Merge pull request #1488 from GriffinRichards/doc-frontierpass2
...
Document frontier pass
2021-08-11 17:40:55 -04:00
GriffinR
28a8fe191a
Document item menu
2021-08-10 22:13:02 -04:00
BuffelSaft
30c983d9ca
Define Burmy forms in battle engine
...
Title. BE needs these to compile on its own.
2021-08-08 13:14:51 +12:00
BuffelSaft
f0cb6190e0
Implement Burmy form change
...
Burmy changes form based on where it last battled.
2021-08-07 20:56:10 +12:00
LOuroboros
b4c4650186
Corrected inconsistent flag label spelling
2021-08-05 17:26:03 -03:00
GriffinR
bd5cf07059
Merge branch 'master' into doc-playerpc
2021-08-02 14:08:10 -04:00
GriffinR
06b909bcd8
Document player pc
2021-08-02 13:58:40 -04:00
GriffinR
3e60a78406
Merge branch 'master' into doc-frontierpass2
2021-07-31 13:30:40 -04:00
GriffinR
602855ea99
Document frontier pass
2021-07-31 13:28:08 -04:00
ghoulslash
ab529b4e89
add stuff cheeks
2021-07-27 10:31:48 -06:00
LOuroboros
f1195e1884
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile
2021-07-27 09:08:52 -03:00
LOuroboros
8012f4b25a
Re-ordered the hidden item flags list
...
Instead of sorting them by location, it makes more sense to sort them by their value.
2021-07-26 20:18:11 -03:00
ghoulslash
4ca6d76160
add bug bite
2021-07-25 14:55:52 -06:00
ghoulslash
c914ed8572
fix sucker punch, surging strikes, obstruct, and snipe shot
2021-07-25 09:38:54 -06:00
ghoulslash
a37d4c3da9
merge with be, give life dew jungle healing effect
2021-07-25 08:22:05 -06:00
ghoulslash
e6a2d2226f
Merge pull request #1540 from DizzyEggg/rage_powder
...
Rage powder updated to gen6
2021-07-24 07:15:58 -06:00
LOuroboros
bfa824f761
Removed unused status ailment constants
2021-07-23 13:18:24 -03:00
ghoulslash
45d4cee243
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball
2021-07-18 11:11:03 -06:00
DizzyEggg
304f3b9203
Merge pull request #1565 from BuffelSaft/disguise-fix
...
Fix Disguise reverting on switch out
2021-07-16 09:17:10 +02:00
BuffelSaft
90fdb74ccb
Remove UndoFormChangeOnSwitch
...
Handle switching out Mimikyu Busted in UndoFormChange.
2021-07-16 17:56:53 +12:00
GriffinR
72bb2bd160
Merge pull request #1474 from GriffinRichards/clean-miragetower
...
Clean up Mirage Tower
2021-07-10 23:26:41 -04:00
BuffelSaft
63faa6e3a9
Fix Disguise reverting on switch out
...
Make Mimikyu's disguise stay busted when it's switched out.
2021-07-11 14:15:24 +12:00
ghoulslash
59c16ff1cf
AI_IsTerrainAffected checks
2021-07-10 16:41:41 -06:00
GriffinR
32fe412755
Merge pull request #1475 from GriffinRichards/doc-minor
...
Label remaining symbols in a few files
2021-07-08 00:24:56 -04:00
GriffinR
fced9e507d
Merge pull request #1478 from Kurausukun/itemprint
...
Change ItemPrintFunc to Use u32 Instead of s32
2021-07-08 00:15:45 -04:00
GriffinR
0f538102d9
Add local id constants for C
2021-07-05 13:54:43 -04:00
ExpoSeed
0ed1d29ece
Include expansion_branches.h in global.h
2021-07-04 12:39:30 -05:00
Kurausukun
42730a8315
Revert "remove gflib"
...
This reverts commit 8b59909ac5
2021-07-03 17:39:33 -04:00
GriffinR
b4f66496ed
Merge pull request #1471 from GriffinRichards/fix-lock
...
Fix some object lock names
2021-07-03 11:21:10 -04:00
ExpoSeed
fb69b65337
Fix redefinition error in battle_config.h
2021-07-02 14:36:55 -05:00
GriffinR
64d06f4c8f
Condense battle AI scripts, minor clean up
2021-07-02 02:46:01 -04:00
GriffinR
8f43d1ebeb
Document smart shopper TV show
2021-07-02 01:45:23 -04:00
GriffinR
fe89a4d147
Label remaining region_map symbols
2021-07-02 00:52:36 -04:00
GriffinR
10886a586b
Clean up mirage tower
2021-07-01 23:46:15 -04:00
ghoulslash
c06029bc72
add last used ball
2021-06-25 13:37:59 -06:00
PikalaxALT
e0b58592b2
Merge pull request #1469 from GriffinRichards/fix-contesthearts
...
Clarify contest heart tiles
2021-06-21 13:59:50 -04:00
GriffinR
810b51f96c
Clarify contest heart tiles
2021-06-21 13:48:03 -04:00
BuffelSaft
4c18cb7fe7
Remove EFFECT_THAW_HIT
2021-06-19 11:49:00 +12:00
Kurausukun
10c80230c4
change printItemFunc to use u32 instead of s32
...
also change a use of -2 to LIST_CANCEL
2021-06-18 00:15:45 -04:00
Kurausukun
8b59909ac5
remove gflib
2021-06-17 22:09:48 -04:00
ExpoSeed
b6b0062bd6
Change map header flags to use a bitfield
2021-06-13 17:02:06 -05:00
MissingNoL
721dbe9178
Implemented all PLG effects
2021-06-12 18:01:35 -07:00
MissingNoL
610b18bfdb
Implemented Double Iron Bash's effect
2021-06-12 14:27:50 -07:00
MissingNoL
beb126b534
Implemented Zippy Zap's effect
2021-06-12 13:58:54 -07:00
ExpoSeed
3ed06c2cc2
Remove remaining grey and replace with gray
2021-06-10 11:36:10 -05:00
BuffelSaft
e6a8faec1e
Fix thawing moves
...
Replace IsThawingMove with a move flag and add a check for it to CANCELLER_FROZEN. This makes thawing moves actually thaw the user.
2021-06-10 23:48:18 +12:00
DizzyEggg
f27dcab784
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
DizzyEggg
4b29ae39ad
Allow one mon double battles
2021-06-08 16:40:47 +02:00
LOuroboros
588b3638d3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into inner_focus
2021-06-07 19:22:20 -03:00
LOuroboros
8726107d42
Removed BattleScript_FlinchPrevention
...
Also reverted a nonsensical change in SetMoveEffect's case MOVE_EFFECT_FLINCH.
2021-06-07 19:18:15 -03:00
ultima-soul
092f02f119
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-06-07 12:00:23 -07:00
MissingNoL
bfc66a21cc
gBattlescriptCurrInstr[3] is not reading species parameter
2021-06-06 19:14:11 -07:00
ultima-soul
2563bc5c83
Merge pull request #1521 from DizzyEggg/largeexp
...
Allow larger exp gains
2021-06-06 13:33:33 -07:00
MissingNoL
9cd522d254
Merge branch 'battle_engine' into Photon_Geyser
2021-06-05 16:46:28 -07:00
MissingNoL
921b80de7c
Update battle_script_commands.h
...
Properly aligned the list of number IDs
2021-06-05 16:40:03 -07:00
ultima-soul
3448e19275
Merge pull request #1459 from ExpoSeed/BE/rename-flags
...
Rename flags
2021-06-04 19:33:45 -07:00
ExpoSeed
4bb33367df
Newline
2021-06-04 19:35:16 -05:00
ExpoSeed
ec2c140ecb
Disambiguate Thousand Arrows flag from other flags
2021-06-04 19:34:37 -05:00
ExpoSeed
15914d7af8
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/rename-flags
2021-06-04 19:00:29 -05:00
ultima-soul
6edec5bc3d
Merge pull request #1437 from LOuroboros/oblivious
...
Tweaked Oblivious
2021-06-04 16:51:38 -07:00
ExpoSeed
0e96b47584
Review comments
2021-06-04 18:50:11 -05:00
LOuroboros
b552db7193
Tweaked the Oblivious immunities
...
Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.
2021-06-04 19:23:07 -03:00
DizzyEggg
4b744374c8
Allow larger exp gains
2021-06-03 23:17:44 +02:00
LOuroboros
b215b44951
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into clanging_scales
2021-06-03 05:09:14 -03:00
LOuroboros
6ccb493f12
Adjusted the list of item hold effects
2021-06-02 17:23:58 -03:00
BuffelSaft
2a6b989c92
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into body-press
2021-06-02 12:41:28 +12:00
LOuroboros
d48a6e00d4
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into oblivious
2021-06-01 18:15:01 -03:00
Kurausukun
2bbaf71998
[LEAK-INFORMED] fix CreateShedinja fakematch
...
info: the header change is required. accesses to the struct need to be
treated as non-const, even though the array must be const. thanks to
jiang for figuring this out.
2021-05-31 08:20:46 -05:00
amiosi
b588e94395
more requested changes
2021-05-28 15:05:33 -04:00
MissingNoL
f30a9542ee
Problem: Photon Geyser is calculating as Shell Side Arm?? Needs: Poison effect, contact move for Shell Side Arm
2021-05-27 22:21:55 -07:00
amiosi
f7651fd592
most fixes from requested changes
2021-05-27 15:55:19 -04:00
amiosi
fc81994579
Merge branch 'battle_engine' into old_findings
2021-05-27 15:28:02 -04:00
ghoulslash
5840b1f0ed
utility umbrella effect
2021-05-24 09:52:45 -06:00
ghoulslash
c3e28e9b1a
merge with be
2021-05-23 12:22:52 -06:00
ghoulslash
54b03a474d
fix SIDE_STATUS_SCREEN_ANY
2021-05-23 12:22:07 -06:00
Eduardo Quezada D'Ottone
04c6331a60
Merge pull request #1432 from BuffelSaft/thousand_arrows
...
Fix Thousand Arrows
2021-05-21 11:40:13 -04:00
gAlfonso-bit
2be29cdb77
Update IsPokemonCryPlaying
2021-05-13 11:23:11 -05:00
GriffinR
65fd334256
Name map groups
2021-05-11 10:16:04 -05:00
