GriffinR
f23e0beeba
Rename battle anim cmds, move its data, name remaining symbols
2021-10-11 13:18:21 -04:00
ghoulslash
06bcfea3b8
merge with be
2021-10-10 19:56:33 -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
GriffinR
862febe03a
Add MAP_OFFSET
2021-10-09 13:19:27 -04:00
GriffinR
d8e65fc4b6
More battle doc, add battle window ids
2021-10-09 03:01:10 -04: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
GriffinR
31b501e7eb
Start misc battle documentation
2021-10-08 16:39:46 -04:00
ghoulslash
ce455ac7e7
merge with be
2021-10-08 07:44:32 -04: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
9a4e0cf757
magician fixes, handle edge cases
2021-10-07 17:37:47 -04:00
GriffinR
a2655ba9ab
Merge branch 'master' into doc-union
2021-10-07 16:10:35 -04:00
GriffinR
6aaf50ee27
Rename GF Gname, Rfu, finish bulk of Union Room, more link doc
2021-10-07 10:43:03 -04:00
ghoulslash
4aeadd96c9
merge with be
2021-10-06 14:49:23 -04:00
ghoulslash
658235c03d
merge with be
2021-10-06 14:33:26 -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
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
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
Eduardo Quezada D'Ottone
43d42c95cf
Terrain Pulse effect implemented
2021-10-04 22:45:37 -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
GriffinR
6e62c057f5
Document remaining symbols in pokemon.c
2021-10-02 23:48:12 -04: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
Pokestia
38a4dea402
Rename Battle Weather flags
2021-09-30 12:08:20 +02: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
GriffinR
a66d7e1b43
Document some single-remaining symbols
2021-09-24 17:14:20 -04:00
Syreldar
4c05520bf3
Fixed Retaliate's naming.
2021-09-24 16:02:26 +02:00
GriffinR
a6ab2eb883
Merge branch 'master' into trailingSpaces
2021-09-23 21:39:21 -04: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
33972b5493
merge with be
2021-09-23 12:04:13 -04:00
ghoulslash
d738297f24
merge with be
2021-09-22 16:26:09 -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
Eduardo Quezada D'Ottone
287ffff2e2
Merge branch 'battle_engine' into burmy-form-change
2021-09-21 22:34:37 -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
f61d516aad
some syntax/format fixes
2021-09-15 17:15:50 -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
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
GriffinR
cbf8863e5b
Clean up Lilycove Lady
2021-09-09 15:24:34 -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
cdec3077b2
Merge pull request #1630 from BuffelSaft/disguise2
...
Fix many Disguise bugs
2021-09-06 10:32:37 +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
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
ghoulslash
dfe59992d3
merge with be
2021-09-01 07:37:45 -04: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
9e4f33d09e
Implemented Desolate Land, Primordial Sea and Delta Stream
2021-08-27 17:56:43 -03:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -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
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
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
LOuroboros
b4c4650186
Corrected inconsistent flag label spelling
2021-08-05 17:26:03 -03:00
ghoulslash
ab529b4e89
add stuff cheeks
2021-07-27 10:31:48 -06:00
ghoulslash
0a0687ae78
add smart wild AI
2021-07-27 09:49:39 -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
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
GriffinR
72bb2bd160
Merge pull request #1474 from GriffinRichards/clean-miragetower
...
Clean up Mirage Tower
2021-07-10 23:26:41 -04:00
GriffinR
0f538102d9
Add local id constants for C
2021-07-05 13:54:43 -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
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
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
Xhyzi
c2bd046ea6
Shell Trap
2021-06-15 20:22:50 +02:00
Xhyzi
155e9b6332
Court Change
2021-06-15 20:14:10 +02:00
Xhyzi
271f19e6cb
Terrain Pulse
2021-06-15 20:01:57 +02:00
Xhyzi
0202b75822
Beak Blast
2021-06-15 19:57:21 +02:00
Xhyzi
7799e49e3a
Corrosive Gas
2021-06-15 19:45:24 +02:00
Xhyzi
e7ec4df70b
Rising Voltage
2021-06-15 17:51:59 +02:00
Xhyzi
ee3f3eb78f
Meteor Beam
2021-06-15 17:06:21 +02:00
Xhyzi
62525516a4
Scale Shot
2021-06-15 16:50:19 +02:00
Xhyzi
60ce39543e
Expanding Force
2021-06-15 16:29:06 +02:00
Xhyzi
5a094a3033
Snap Trap
2021-06-15 16:22:42 +02: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
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
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
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
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
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
GriffinR
65fd334256
Name map groups
2021-05-11 10:16:04 -05:00
LOuroboros
95d41524a2
Implemented Clanging Scales' effect
2021-05-09 18:20:03 -03:00
Flametix
a8fab62c89
Fix Substitute typo
2021-05-06 20:49:04 -04:00
ultima-soul
e864c39a5d
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
2021-05-04 10:04:35 -07:00
ultima-soul
56fc420187
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 21:34:30 -07:00
GriffinR
f7a699c686
Merge pull request #1421 from GriffinRichards/doc-tvrecordmix
...
Document TV
2021-04-29 00:25:01 -04:00
GriffinR
58cef0ae52
Merge pull request #1418 from GriffinRichards/sync-ereaderhelp
...
Sync e-reader helpers, document trainer hill e-reader
2021-04-28 06:08:57 -04:00
ultima-soul
14a0303e2f
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-27 18:36:37 -07:00
GriffinR
aad090e154
Document TV
2021-04-26 12:35:35 -04:00
GriffinR
86475c5ded
Document trainer hill ereader
2021-04-24 18:04:27 -04:00
GriffinR
bc9fc38254
Misc contest cleanup
2021-04-22 15:51:04 -04:00
GriffinR
dbe24f0baa
Clean up contest_painting
2021-04-21 20:04:12 -04:00
ExpoSeed
27c6964a05
Merge branch 'num_ability_slots' into BE/num_ability_slots
2021-04-16 20:45:34 -05:00
ExpoSeed
49bb345338
Introduce NUM_ABILITY_SLOTS
2021-04-16 20:36:45 -05:00
GriffinR
82f870091e
Merge pull request #1400 from GriffinRichards/doc-pokemonanim
...
Document Pokémon animation
2021-04-13 01:36:15 -04:00
GriffinR
09a9efd5c5
Merge pull request #1398 from GriffinRichards/doc-field
...
Document field
2021-04-10 13:05:51 -04:00
GriffinR
f6016838b1
Merge pull request #1397 from GriffinRichards/doc-moremisc
...
Clean up battle scripts
2021-04-10 12:41:35 -04:00
GriffinR
72ba8cf58d
Document pokemon animation types
2021-04-10 00:50:28 -04:00
ExpoSeed
8494306d1d
Rename flags
2021-04-07 16:07:30 -05:00
GriffinR
4a1cfbead2
Document remaining overworld
2021-04-06 16:55:43 -04:00
GriffinR
86a9d94ce1
Document fieldmap
2021-04-06 16:05:43 -04:00
GriffinR
756fad0e61
Document some event object movement
2021-04-06 14:34:36 -04:00
GriffinR
00c3044c96
Clarify Groudon/Kyogre/Rayquaza gfx names
2021-04-06 02:38:15 -04:00
GriffinR
f4d8a91ba4
Misc battle script cleanup
2021-04-03 14:07:31 -04:00
GriffinR
9ea9ffde09
Add remaining multistring chooser constants
2021-04-03 11:49:06 -04:00
ultima-soul
939608f5b8
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-02 13:16:40 -07:00
GriffinR
1b8d405b5e
Add missing include guard suffixes
2021-04-02 12:54:40 -04:00
GriffinR
c9d3b26ff7
Label miss string indexes
2021-04-02 02:12:46 -04:00
GriffinR
8be2c5d60b
Document Contest Lady TV Show
2021-04-02 01:49:38 -04:00
GriffinR
a0b3d4df12
Merge pull request #1390 from GriffinRichards/doc-introcred
...
Document intro and credits sequences
2021-04-01 23:13:59 -04:00
GriffinR
771a434730
Label Trend Watcher TV show texts
2021-03-31 16:29:42 -04:00
GriffinR
86856098a3
Document Dewford Trend
2021-03-31 16:08:42 -04:00
BuffelSaft
35add44a90
Thousand Arrows hits airborne targets
...
Thousand Arrows now hits flying types, Pokémon with Levitate, Pokémon holding an Air Balloon, and Pokémon under the effect of Magnet Rise, Telekinesis etc.
Also fixed its effect chance, which was 0 instead of 100.
2021-03-31 23:05:30 +13:00
GriffinR
50e9666e16
Merge branch 'master' into doc-introcred
2021-03-29 20:56:15 -04:00
GriffinR
c40fb9288c
Merge pull request #1378 from GriffinRichards/doc-berrycrush
...
Document Berry Crush
2021-03-29 12:38:16 -04:00
GriffinR
62968895ca
Add MON_PIC_SIZE constant
2021-03-29 09:38:19 -04:00
ghoulslash
a595b213b4
merge with be
2021-03-28 17:29:22 -06:00
GriffinR
7a5c6d4d86
Standardize Friendship/Happiness
2021-03-27 17:27:20 -05:00
ultima-soul
5bab9474dc
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-03-22 23:08:19 -07:00
GriffinR
6127c6f32e
Misc labels in battle facilities
2021-03-22 15:30:19 -05:00
GriffinR
22e2c0a47c
Document Berry Crush
2021-03-18 15:18:23 -04:00
BuffelSaft
7d237d8ff6
Implement Body Press' effect
...
Body Press calculates damage using the user's defense stat instead of its attack. Also adds a special variant of the effect that uses the special defense stat.
2021-03-16 22:56:44 +13:00
amiosi
b081a00891
Merge branch 'battle_engine' into old_findings
2021-03-13 09:59:09 -05:00
Eduardo Quezada D'Ottone
292993e360
Merge pull request #1338 from ghoulslash/ripen
...
Add Ripen and Finish Gen4 Berries
2021-03-13 11:16:42 -03:00
LOuroboros
68980cf18c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile
2021-03-10 03:58:21 -03:00
ghoulslash
d5004638a9
Update include/constants/battle_config.h
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-03-09 16:35:47 -07:00
ghoulslash
3f9bf5acc0
merge with be
2021-03-09 10:33:48 -07:00
GriffinR
55a40b901f
Label battle tower link script
2021-03-04 19:30:19 -06:00
Evan
2ccdf1d89e
merge with be. magic guard checks
2021-03-03 09:21:06 -07:00
ghoulslash
3a30fe900a
Update include/constants/hold_effects.h
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:13:49 -07:00
ultima-soul
e5fa583a08
Merge pull request #1334 from ghoulslash/gen8_abilities
...
More Gen 8 Abilities
2021-03-01 10:40:09 -08:00
Evan
6cb8c6309a
merge with be
2021-03-01 11:28:51 -07:00
Evan
55649a67cc
Merge branch 'terrain' of https://github.com/ghoulslash/pokeemerald into terrain
2021-03-01 11:23:05 -07:00
Evan
55b8538f68
merge with be
2021-03-01 11:22:37 -07:00
ultima-soul
f6147ee054
Merge pull request #1356 from ghoulslash/tailwind_turns
...
Update tailwind timer To Gen5
2021-03-01 08:51:40 -08:00
GriffinR
c6141fea83
Document easy chat
2021-02-24 11:03:45 -05:00
GriffinR
1cac608dbe
Document mail
2021-02-24 11:03:39 -05:00
GriffinR
06ae5a37e2
Merge pull request #1336 from GriffinRichards/giftribbons
...
Document some ribbon usage
2021-02-24 10:07:59 -05:00
GriffinR
fc3d6eb178
Merge pull request #1328 from GriffinRichards/doc-pokeuseitem
...
Document PokemonUseItemEffects
2021-02-22 12:15:19 -05:00
SphericalIce
381116b3c4
Add labels for cracked floor metatiles
2021-02-22 15:29:14 +00:00
GriffinR
02c1fbd733
Document ribbon TV show, add new ribbon IDs/size
2021-02-18 09:59:24 -05:00
GriffinR
e059c4fdfa
Use new gift ribbons size, label unused ribbons
2021-02-17 14:11:45 -05:00
GriffinR
ee4af94a36
Merge pull request #1324 from GriffinRichards/doc-sb
...
Document remainder of secret_base.c
2021-02-15 17:41:55 -05:00
Deokishisu
7b2bf8c7e2
Rename obedient/fatefulEncounter to eventLegal
...
Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind.
Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.
2021-02-15 14:54:35 -05:00
Deokishisu
b89c3e901e
Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h
...
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi.
The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
2021-02-15 11:40:16 -05:00
GriffinR
5f58ea02c6
Merge pull request #1330 from sphericalice/hidden-to-buried
...
Rename 'hidden' Trainers/obj events to 'buried'
2021-02-14 21:48:21 -05:00
SphericalIce
56e047f949
Fix Lilcove Motel typos
2021-02-14 21:38:39 +00:00
SphericalIce
70ff6c3b84
Rename 'hidden' Trainers/obj events to 'buried'
2021-02-14 19:25:23 +00:00
GriffinR
be0699bd64
Merge pull request #1326 from GriffinRichards/doc-layouts
...
Label unused layouts
2021-02-14 14:22:28 -05:00
GriffinR
a85ac11b28
Merge pull request #1325 from GriffinRichards/constants-berrytree
...
Add berry tree id constants
2021-02-14 14:15:51 -05:00
Evan
d65d5cb8fd
add AI_FLAG_SMART_SWITCHING, some burn checks
2021-02-14 09:37:04 -07:00
GriffinR
8634710996
Document PokemonUseItemEffects
2021-02-12 16:02:04 -05:00
Evan
f3d975e239
merge with be
2021-02-12 08:59:55 -07:00
LOuroboros
21ee6cb9fb
Added constant labels for EV manipulating item effects
2021-02-12 07:26:11 -03:00
amiosi
1df295a582
battle config and zippy zap
...
plus fix mirror move mistakes
2021-02-11 17:11:07 -05:00
amiosi
c0ba7436af
water shuriken and howl
2021-02-11 16:20:13 -05:00
GriffinR
20b76c6071
Fix swapped route 102 berries
2021-02-10 16:26:09 -05:00
GriffinR
2237d0748f
Label unused layouts
2021-02-08 14:45:56 -05:00
GriffinR
0851c34bac
Add berry tree id constants
2021-02-05 15:25:12 -05:00
GriffinR
a240481d5f
Document secret_base.c
2021-02-05 12:08:25 -05:00
Deokishisu
ac43365d58
Fix "Compatibility" Misspelling
...
Someone misspelled "compatibility" as "compatability" in the daycare-related files. This commit spells them correctly.
2021-02-05 01:27:11 -05:00
Evan
f4d4cf262e
fix screen cleaner, curious medicine, as one
2021-02-02 09:00:07 -07:00
ultima-soul
2a20d50904
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-02-01 15:54:08 -08:00
Evan
9fcf7d2453
zero terrain timers for steel roll, remove unused move effectd
2021-01-28 13:51:39 -07:00
Evan
c009b51ae8
add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot
2021-01-28 13:27:00 -07:00
Evan
a37acb8345
coaching, lash out, burning jealousy
2021-01-28 12:21:11 -07:00
Evan
dd51edd881
add eerie spell, surging strikes, jungle healing
2021-01-28 10:51:00 -07:00
Evan
c003f1c023
check move effectiveness with status effects
2021-01-26 15:41:59 -07:00
GriffinR
0064333e4a
Clean up scrcmd.c
2021-01-26 02:16:26 -05:00
Evan
5aff5333dc
fix B_MEMENTO_FAIL comment
2021-01-21 12:05:01 -07:00
Evan
bfb7333507
memento gen4 failing
2021-01-21 12:03:30 -07:00
GriffinR
8fe4d004e3
Merge pull request #1305 from GriffinRichards/doc-battletv
...
Document battle tv data
2021-01-21 12:27:14 -05:00
Evan
4611c71bd1
merge with be
2021-01-21 08:55:14 -07:00
Evan
8ec12c665c
merge with be
2021-01-20 17:36:13 -07:00
Evan
e61309dce6
merge with be
2021-01-20 17:34:24 -07:00
Evan
16d54b6d32
merge with be, add form checks to CanBattlerGetOrLoseItem
2021-01-20 14:28:03 -07:00
ExpoSeed
61db82e64a
Revert "Included global.h into battle_config.h"
2021-01-19 22:55:08 -06:00
GriffinR
6999b237eb
Merge pull request #1309 from GriffinRichards/misc-macro
...
Use constants for item data, misc other constants/fixes
2021-01-19 20:49:58 -05:00
ghoulslash
9d9da6a485
Update include/constants/battle_config.h
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-01-19 15:01:51 -07:00
Evan
b576eb5247
fix var_terrain default, wording
2021-01-19 13:26:36 -07:00
GriffinR
752982552e
Add FIRST_BALL, some FIRST_BERRY_INDEX usage
2021-01-19 13:39:18 -05:00
SphericalIce
2dfaba9472
Name color return values more accurately
2021-01-19 17:59:36 +00:00
SphericalIce
8de76ed533
Make broader use of RGB macros
2021-01-19 17:15:12 +00:00
GriffinR
cf9f8d01c5
Add misc item data constants
2021-01-19 05:49:20 -05:00
LOuroboros
77d714ead5
Included global.h into battle_config.h
...
Fixes the dupplicated defines issue.
2021-01-16 20:37:34 -03:00
Evan
a49b5d1ad0
prankster updated to gen 7
2021-01-16 16:14:36 -07:00
Evan
10b1d33d13
handle battler being affected by terrain
2021-01-16 12:05:51 -07:00
Evan
544d598506
update tailwind timer
2021-01-15 18:34:47 -07:00
Evan
449c2bcc34
add config option
2021-01-15 18:28:10 -07:00
Evan
0d8f804194
update mental herb to gen 5
2021-01-15 18:11:55 -07:00
Evan
f1d89b2d79
merge with be
2021-01-15 11:17:45 -07:00
ExpoSeed
b166e9a5e3
Merge pull request #1276 from LOuroboros/x_items_BE
...
Reworked the effects of the X Items #1
2021-01-15 12:05:07 -06:00
LOuroboros
c2f718d3d3
Implemented Cramorant's Gulp Missile form change
2021-01-14 17:23:09 -03:00
GriffinR
564278fd49
Document battle tv data
2021-01-14 06:29:59 -05:00
Evan
d571c8b028
B_TERRAIN_BG_CHANGE TRUE by default
2021-01-13 16:02:32 -07:00
Evan
d26605c9fe
fix bad bg fade if no permanent terrain
2021-01-13 16:01:47 -07:00
Evan
9902f6e603
merge with be
2021-01-13 14:32:14 -07:00
GriffinR
b9e1b050e1
Label remaining battle types
2021-01-13 15:20:29 -05:00
Evan
56395a060f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
2021-01-13 09:23:07 -07:00
ghoulslash
fba17a96a4
Merge pull request #1253 from surskitty/battle_engine
...
Increase readability of too-long names
2021-01-12 09:20:53 -07:00
GriffinR
92de664f79
List battle animation indexes alongside tables
2021-01-11 16:07:16 -05:00
surskitty
29343ce1ec
Remove synonyms
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-01-11 15:00:11 -05:00
opakedragon
cbaf9b38b2
rename string id to reflect usage
2021-01-11 08:48:00 -05:00
surskitty
f58539b602
Renaming the last two and fixing the merge conflict with PE.
2021-01-10 15:48:57 -05:00
surskitty
a0f1dcb9cf
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine
2021-01-10 15:40:21 -05:00
Evan
1e22ae4cf2
merge with be
2021-01-10 09:08:25 -07:00
Evan
d4e4405cf5
merge with be
2021-01-10 09:04:21 -07:00
Evan
c95bfae701
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_hold_effects
2021-01-10 09:02:21 -07:00
Evan
e748db8ef4
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
2021-01-10 08:58:16 -07:00
LOuroboros
3ffa7f993a
Renamed some X Defend labels to reflect its new name in the IE
2021-01-10 01:58:02 -03:00
ultima-soul
b5b4efdaa0
Merge pull request #1314 from LOuroboros/battle_debug_constant
...
battle_config.h tweaks
2021-01-09 12:36:37 -08:00
Evan
b5128be68b
eject packer invisible before openpartymenu
2021-01-08 08:02:00 -07:00
Evan
6dabff1ee3
merge with be
2021-01-07 21:24:21 -07:00
Evan
0118723a9c
add eject button
2021-01-07 20:31:27 -07:00
Evan
5eb49722c0
add red card effect
2021-01-07 19:33:39 -07:00
SphericalIce
3c2a33b9b2
Use constants for max IVs & the random IV generation flag
2021-01-07 22:13:14 +00:00
ultima-soul
d2d961e447
Merge pull request #1262 from LOuroboros/gen8_abilities_BE
...
Implemented various Gen. 8 abilities
2021-01-07 13:31:17 -08:00
LOuroboros
8511ed57e4
Tweaked Steam Engine's battle string
2021-01-07 18:13:16 -03:00
ghoulslash
c392a2011e
Merge pull request #1325 from ExpoSeed/BE/sync
...
Sync battle engine
2021-01-07 12:13:26 -07:00
LOuroboros
3d124944b3
Review correction to B_X_ITEMS_BUFF's comment
2021-01-07 16:09:23 -03:00
LOuroboros
cb22cbd3f6
Tweaked preprocessor constant in include/constants/item_effects.h
2021-01-07 16:06:55 -03:00
Evan
7fffe23e63
add terrain seeds
2021-01-06 20:22:05 -07:00
Evan
d5d2cac60c
init branch
2021-01-06 14:42:45 -07:00
Evan
aac3f9c3db
kee, maranga, sitrus beries
2021-01-06 13:07:18 -07:00
Evan
7646855e79
jaboca, rowap berry effects
2021-01-06 11:15:56 -07:00
Evan
efa4fe89ad
micle berry
2021-01-06 10:47:07 -07:00
Evan
f2e486eb0d
custap berry effect, custap/quick claw activation message
2021-01-06 09:37:31 -07:00
Evan
4c1e8f2f2e
add curious medicine
2021-01-05 20:02:11 -07:00
Evan
0a3908ee92
add neigh and as one abilities
2021-01-05 19:37:23 -07:00
Evan
f21b0140b9
revert to CheckViability and stat change effect viabilities
2021-01-04 19:39:59 -07:00
Evan
5ae1e3c25b
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
2021-01-04 11:43:36 -07:00
LOuroboros
dbc3690282
Tweaked preprocessor directives
...
Changed #ifdef X_ITEMS_REWORK == FALSE to #ifndef ITEM_EXPANSION
Changed #ifdef X_ITEMS_REWORK == TRUE to #ifdef ITEM_EXPANSION
2021-01-04 03:58:31 -03:00
LOuroboros
517c8ffdd0
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities_BE
2021-01-03 22:05:14 -03:00
ExpoSeed
7dadcb94b8
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-03 17:14:43 -06:00
BuffelSaft
10cf5b3673
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into Batte_Engine_Only
2021-01-04 10:55:30 +13:00
Evan
f172245ad6
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into totem
2021-01-01 08:49:43 -07:00
ExpoSeed
24362e8bed
Merge pull request #1250 from ghoulslash/infestation
...
infestation between turn anim
2020-12-31 18:06:13 -06:00
surskitty
aa9796a6ae
Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip.
2020-12-31 18:57:36 -05:00
GriffinR
769ddf22c2
Label remaining subs in battle_tower.c
2020-12-24 16:18:47 -05:00
Evan
59813c9ce7
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be_config
2020-12-23 10:27:54 -07:00
ghoulslash
450ac70ab2
Merge pull request #1288 from LOuroboros/comments
...
Some more small battle_config.h tweaks
2020-12-23 10:27:09 -07:00
LOuroboros
320cc37ac9
USE_BATTLE_DEBUG -> B_ENABLE_DEBUG
2020-12-23 14:04:14 -03:00
LOuroboros
b3c5613ff7
battle_config.h tweaks
...
-Moved the USE_BATTLE_DEBUG constant from include/battle_debug.h
-Slight correction to a few comments in battle_config.h
2020-12-23 13:16:01 -03:00
Evan
a426092006
fix sticky barb theft in trainer battles
2020-12-22 08:35:11 -07:00
ghoulslash
0af8cab87e
Merge pull request #1283 from LOuroboros/ct_moves_data
...
Added the data of SwSh's Crown Tundra's moves
2020-12-21 23:13:23 -07:00
Evan
5bdf266000
add additional item theft check
2020-12-20 19:06:50 -07:00
Evan
a0b9ece980
merge with BE
2020-12-20 16:39:50 -07:00
Evan
21e7d6d318
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
2020-12-20 16:33:43 -07:00
Evan
7988a1f41d
Ai_TryOnAlly and reorganize files
2020-12-20 14:47:20 -07:00
Evan
31ec3e8479
non-partner good move checks
2020-12-19 21:58:23 -07:00
LOuroboros
a417a1b2b9
Corrected Punk Rock's checks
2020-12-19 16:18:39 -03:00
Evan
916d0416e3
outline AI_CheckGoodMove
2020-12-15 21:57:33 -07:00
Evan
b85dacce9d
fix conflicts
2020-12-14 08:50:41 -07:00
Evan
67fefd0261
var terrain, surge fixes
2020-12-13 19:42:48 -07:00
Evan
97172fc5b5
merge with be
2020-12-13 17:21:22 -07:00
Evan
ead8637e4f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation
2020-12-13 17:09:04 -07:00
Evan
ac332d5e98
check bad move
2020-12-13 15:02:21 -07:00
Tim Gates
581306db7b
docs: fix simple typo, redunant -> redundant
...
There is a small typo in include/constants/battle_frontier.h.
Should read `redundant` rather than `redunant`.
2020-12-13 22:14:50 +11:00
Eduardo Quezada D'Ottone
47d96aed3c
Merge pull request #1285 from LOuroboros/spite
...
Updated Spite
2020-12-12 22:27:26 -03:00
Eduardo Quezada D'Ottone
db9933ce67
Merge pull request #1244 from ghoulslash/popup
...
toggleable manual ability popup destruction
2020-12-12 20:36:55 -03:00
LOuroboros
55bc2b4bb9
Corrected small inconsistency in move flag names
2020-12-12 12:18:56 -03:00
LOuroboros
31d483ef44
Some more battle_config.h tweaks
2020-12-12 11:35:05 -03:00
LOuroboros
c5e04cf243
Removed the unnecessary Dragon Energy effect
...
The move is an Eruption clone, whose effect was already done. Thanks to BuffelSaft for the heads up.
I took the chance and fixed its target too.
2020-12-12 01:35:54 -03:00
LOuroboros
33d7f22494
Improved the comment of B_STANCE_CHANGE_FAIL
2020-12-11 21:54:17 -03:00
LOuroboros
17a9555715
Oopsie.
2020-12-11 21:43:18 -03:00
LOuroboros
9ec2e44f4c
Updated Spite
2020-12-11 21:36:59 -03:00
LOuroboros
0ac026e6ca
Added the data of SwSh's Crown Tundra's moves
...
And Dragon Energy's effect. Eerie Spell's is the only one missing out of this bunch.
2020-12-11 20:49:23 -03:00
LOuroboros
c930a63c84
Implemented Punk Rock
2020-12-11 19:46:33 -03:00
LOuroboros
2b0702ec04
Implemented Perish Body
...
Inspired by Raguzero's implementation.
2020-12-11 19:44:32 -03:00
LOuroboros
7d8b8083e8
Implemented Sand Spit
2020-12-11 16:47:23 -03:00
LOuroboros
322918e280
Implemented Steam Engine
...
And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.
2020-12-10 18:27:35 -03:00
Evan
34dd11448b
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 10:28:18 -07:00
Evan
a93a8b2194
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine
2020-12-08 20:50:43 -07:00
LOuroboros
791d561f14
Reworked the effects of the X Items
...
Thanks to Karathan's indications.
2020-12-08 18:24:42 -03:00
GriffinR
f95192ed87
Define terminal species IDs relatively
2020-12-08 00:45:05 -05:00
BuffelSaft
72b769ec75
Add config options for Jump Kick
...
Added options for:
- Gen 4 style recoil when target is immune (user takes 50% of target's max HP)
- Gen 3 style recoil when target is immune (i.e no recoil)
- Gen 5+ recoil was already implemented but was bugged
2020-12-07 19:30:31 +13:00
Evan
d5ad14c349
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into popup
2020-12-05 21:03:20 -07:00
Evan
21cab1b7a7
better negative totem boost system, totems occur before switch in abilities
2020-12-05 21:00:51 -07:00
LOuroboros
6a0fee9c56
Fixed Intrepid Sword and Dauntless Shield
...
And also introduced a new BattleString for BattleScript_BattlerAbilityStatRaiseOnSwitchIn
2020-12-05 14:03:13 -03:00
Evan
39cbc21925
fix trainer theft, update config option
2020-12-03 08:42:12 -05:00
LOuroboros
9e1d7cc827
Implemented Ball Fetch
2020-12-02 23:09:35 -03:00
Evan
dcefaf2563
anim particle changes false by default
2020-12-01 18:01:02 -05:00
Evan
4ad5e368a9
fix merge conflicts
2020-12-01 17:57:57 -05:00
Evan
1e68c46890
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation
2020-12-01 17:51:38 -05:00
Evan
5478179464
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_anims
2020-12-01 17:46:26 -05:00
ExpoSeed
aa7facf57b
Merge pull request #1243 from ghoulslash/abilities
...
Finish Switch In Ability Activation Messages
2020-11-28 20:27:32 -06:00
Evan
7c6e74ab69
update terrain bg config option comment
2020-11-24 21:17:31 -05:00
Evan
6c0878b5fe
infestation between turn anim
2020-11-24 17:21:59 -05:00
GriffinR
513c7c5f45
Clarify Kecleon objects
2020-11-23 14:42:47 -05:00
Evan
ef43596a79
toggleable manual ability popup destruction
2020-11-19 15:16:27 -07:00
Evan
07a4400d50
finish switch in ability messages
2020-11-19 11:42:00 -07:00
