BuffelSaft
6b65ef5bcf
Merge pull request #1824 from ghoulslash/itemheal_fix
...
Fix iteam healing after a failed move
2021-10-30 15:25:28 +13:00
BuffelSaft
f0e9b09258
Merge pull request #1822 from ghoulslash/harvest
...
fix recycle and harvest
2021-10-30 15:00:56 +13:00
GriffinR
f51247615e
Finish documenting battle_transition
2021-10-29 18:32:53 -04:00
cbt6
9a1764f83e
Label some animation index numbers
2021-10-30 01:37:49 +08:00
GriffinR
07bf225f94
Continue battle_transition documenting
2021-10-29 11:24:36 -04:00
ghoulslash
2502820e83
document a couple hitmarkers. fix failing moves not updating hp from own healing effects
2021-10-29 09:03:14 -04:00
ghoulslash
204748e01a
fix recycle and harvest
2021-10-28 17:52:52 -04:00
ghoulslash
f342e7c590
merge with be
2021-10-28 17:03:10 -04:00
ghoulslash
e2e31f0b74
skill swap config option for switchin abilities
2021-10-28 16:53:00 -04:00
LOuroboros
a77f058146
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-10-28 14:24:43 -03:00
ghoulslash
34e966fdee
Merge pull request #1815 from LOuroboros/hyperspaceFury
...
Implemented Hyperspace Fury
2021-10-28 13:20:33 -04:00
LOuroboros
82101d3581
Optimizations
2021-10-28 14:02:43 -03:00
LOuroboros
28522f3ffb
Fixed Hyperspace Fury not breaking through protections
...
Also repositioned VARIOUS_JUMP_IF_SPECIES.
2021-10-28 12:09:44 -03:00
ghoulslash
bebaded415
merge with be
2021-10-27 16:48:38 -04:00
GriffinR
41ecae91f8
Label remaining symbols in graphics.c
2021-10-27 13:47:18 -04:00
LOuroboros
8c35a68060
Quick syntax tweaks
2021-10-27 11:19:39 -03:00
LOuroboros
fc7f1acf20
Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser
2021-10-27 11:13:59 -03:00
LOuroboros
1ab8c84f41
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury
2021-10-26 21:23:21 -03:00
Eduardo Quezada D'Ottone
773c773bac
Merge remote-tracking branch 'RHH/battle_engine' into BE_ghostEscape
...
# Conflicts:
# include/constants/battle_config.h
2021-10-26 20:35:01 -03:00
GriffinR
b0c27a8521
Document ereader screen
2021-10-26 15:44:42 -04:00
GriffinR
f9f91be60a
Merge pull request #1527 from cbt6/field-player
...
Document field player functions
2021-10-26 14:29:44 -04:00
GriffinR
d6571f2355
Merge pull request #1525 from GriffinRichards/doc-recmix
...
Document remainder of Record Mixing
2021-10-26 14:18:38 -04:00
cbt6
b3d779fd0d
Document field player functions
2021-10-27 01:39:00 +08:00
GriffinR
4f7f6c1082
Merge pull request #1526 from sphericalice/doc-curtain-special
...
Document the CloseBattlePikeCurtain special
2021-10-25 16:10:45 -04:00
sphericalice
7b5267c799
Rename TILESET_WIDTH to METATILE_ROW_WIDTH
2021-10-25 20:51:04 +01:00
sphericalice
5bce17cbce
Fix typo in the TILESET_WIDTH comment
2021-10-25 18:11:06 +01:00
sphericalice
120e75d275
Document the CloseBattlePikeCurtain special
2021-10-25 18:03:14 +01:00
GriffinR
a612c27f2d
Drop battle transition 'phase' terminology
2021-10-25 10:20:48 -04:00
GriffinR
6dc3c9864c
Merge pull request #1520 from GriffinRichards/doc-random
...
Document random remaining symbols
2021-10-24 23:43:17 -04:00
Eduardo Quezada D'Ottone
44625561e5
Taunt turn config
2021-10-24 20:21:54 -03:00
Eduardo Quezada D'Ottone
70aeaf288f
Rough Skin damage config
2021-10-24 20:07:22 -03:00
Eduardo Quezada D'Ottone
8699db942b
More ordering
2021-10-24 20:03:21 -03:00
GriffinR
7a89ad98c3
Document record mixing hall records
2021-10-24 16:13:07 -04:00
GriffinR
ab80264921
Merge pull request #1519 from GriffinRichards/doc-mgift
...
Document Mystery Gift
2021-10-24 15:50:39 -04:00
GriffinR
7f3c529935
Document record mixing mail swap
2021-10-24 15:49:19 -04:00
BuffelSaft
4310868bee
AI handles multi-strike and fixed dmg moves
...
Does not account for Parental Bond or Beat Up yet as those require some functions from #1676 .
2021-10-24 18:49:17 +13:00
Eduardo Quezada D'Ottone
71ff664700
Ordered config into new categories
2021-10-23 20:11:02 -03:00
Eduardo Quezada D'Ottone
d95351dd97
Merge branch 'BattleEngine' into BE_config
...
# Conflicts:
# include/constants/battle_config.h
2021-10-23 19:46:33 -03:00
Eduardo Quezada D'Ottone
abb8a97d21
Merge pull request #1616 from LOuroboros/statCalcs
...
Added configs for modern post-battle stat calcs
2021-10-23 13:35:21 -03:00
Eduardo Quezada D'Ottone
9a8b88bdb3
Updated config description
2021-10-23 11:59:57 -03:00
Eduardo Quezada D'Ottone
76b6250104
Merge branch 'battle_engine' into plasmaFists
2021-10-23 11:06:34 -03:00
Jademalo
62436d9f67
IDE support formatting and consistency
2021-10-23 10:10:00 +01:00
Eduardo Quezada D'Ottone
382ec13492
Merge pull request #1752 from ghoulslash/quick_draw
...
Quick Draw
2021-10-22 22:39:03 -03:00
Eduardo Quezada D'Ottone
d0253640fb
Merge pull request #1739 from LOuroboros/primalReversionBE
...
Implemented Primal Reversion
2021-10-22 22:27:45 -03:00
Jademalo
eb860a368e
Improve IDE support
2021-10-22 04:30:33 +01:00
GriffinR
303ce856ad
Fix GET_CARD_BATTLE_LOST typo
2021-10-21 16:54:16 -04:00
GriffinR
bc409baeff
Fix incorrect NUM_SECTORS_PER_SLOT define
2021-10-19 16:30:00 -04:00
ghoulslash
416c517e49
Merge pull request #1786 from Xavion3/damage_debug
...
Adds simulated damage to the debug menu
2021-10-19 12:14:38 -04:00
LOuroboros
a6315ffc75
Implemented Plasma Fists
2021-10-19 09:50:18 -03:00
ghoulslash
eda99fcf29
Merge pull request #1742 from AsparagusEduardo/be_gStatuses4
...
Add gStatutes4
2021-10-19 08:45:47 -04:00
GriffinR
934a7e7a5d
Merge pull request #1516 from GriffinRichards/doc-miscbattle
...
Miscellaneous battle documentation
2021-10-19 08:09:17 -04:00
Xavion3
150dd7c633
Add damage information to the debug menus
2021-10-19 22:39:07 +11:00
LOuroboros
d9b8e11a9c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE
2021-10-19 07:47:42 -03:00
GriffinR
24b4e898ad
More mauville_old_man clean up
2021-10-18 14:40:04 -04:00
GriffinR
b31bddddca
Clean up metatile_behavior
2021-10-18 12:54:29 -04:00
GriffinR
46dd10c87b
Clean up trainer_pokemon_sprites
2021-10-18 01:56:24 -04:00
GriffinR
db8ce5d7f9
Clean up mauville_old_man, drop ScrSpecial prefix
2021-10-18 01:09:41 -04:00
ghoulslash
8dc77e6fe3
Merge pull request #1782 from LOuroboros/glare
...
Updated Glare
2021-10-17 22:11:33 -04:00
GriffinR
ed6fdd743f
Some pokemon_icon clean up
2021-10-17 22:04:08 -04:00
GriffinR
a950f9c771
Clean up international_string_util
2021-10-17 21:51:11 -04:00
Eduardo Quezada D'Ottone
ead5c92469
Merge branch 'battle_engine' into PLG
2021-10-17 17:38:54 -03:00
LOuroboros
e7ad7319e3
Updated Glare
2021-10-17 12:03:35 -03:00
Eduardo Quezada D'Ottone
df817fb2ab
Merge pull request #1772 from LOuroboros/gravApple
...
Added Grav Apple's power boost
2021-10-17 09:51:29 -03:00
LOuroboros
59cfbe55c1
Gave Grav Apple a move effect of its own
2021-10-17 09:27:35 -03:00
GriffinR
ece7ef3410
Correct usage of MysteryEvent to MysteryGift
2021-10-17 03:00:48 -04:00
GriffinR
d0455485c3
Clean up mystery gift headers
2021-10-17 02:18:24 -04:00
GriffinR
3cd27acbea
Document wonder news
2021-10-17 02:09:31 -04:00
GriffinR
5f9069628d
Clean up mevent2
2021-10-17 01:35:26 -04:00
GriffinR
c7d550e96c
Clean up wonder card/news view
2021-10-17 01:15:16 -04:00
GriffinR
845a5e99cc
General mystery gift documentation, finish mystery gift client/server/scripts
2021-10-16 23:35:17 -04:00
ghoulslash
964e7efba9
fix MOVE_TARGET_ALL_BATTLERS and other u8 vars
2021-10-16 16:23:17 -04:00
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
GriffinR
e1900efe1e
Merge branch 'master' into doc-miscbattle
2021-10-15 22:46:43 -04:00
GriffinR
1f39c34ca4
Merge branch 'master' into minor-constants
2021-10-15 22:44:49 -04:00
GriffinR
a4a3c1c9e5
Merge pull request #1511 from GriffinRichards/doc-union
...
Document link_rfu / Union Room
2021-10-15 22:44:01 -04: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
GriffinR
e3bb257bcf
Fix some trainer card link access
2021-10-15 12:22:19 -04:00
GriffinR
c02001c46d
Document mystery gift link scripts, general mystery gift
2021-10-15 12:05:06 -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
GriffinR
37e52c4f34
Document some mystery gift
2021-10-14 15:10:41 -04:00
GriffinR
95406384f4
Start wonder card/news documenting
2021-10-14 13:24:20 -04: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
GriffinR
9ab03f454d
Small correction to map script comments
2021-10-13 23:24:10 -04: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
GriffinR
def6cc8158
Label battle script macro arguments
2021-10-13 17:44:04 -04:00
GriffinR
fc15b0d5f0
Add controller buffer constants, finish misc battle doc
2021-10-13 16:21:39 -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
GriffinR
b0598b1aef
Clean up recorded_battle, add MOVE_IS_PERMANENT
2021-10-12 01:14:17 -04:00
GriffinR
f23e0beeba
Rename battle anim cmds, move its data, name remaining symbols
2021-10-11 13:18:21 -04:00
GriffinR
3a7995bc7c
Fix misleading RecordMixTrainerNames name
2021-10-11 10:39:37 -04:00
GriffinR
b8a44bf10a
Calculate pokemon substruct size, missing MON_PIC_SIZE
2021-10-11 10:35:53 -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
GriffinR
862febe03a
Add MAP_OFFSET
2021-10-09 13:19:27 -04:00
GriffinR
28de627913
Add TRACKS_ALL, remove BGCntrlBitfield
2021-10-09 11:34:51 -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
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
GriffinR
7c5c41f23c
Combine link slot length constants
2021-10-07 16:19:02 -04:00
GriffinR
a2655ba9ab
Merge branch 'master' into doc-union
2021-10-07 16:10:35 -04:00
GriffinR
e86d3410a1
Update argument names in link headers, link_rfu doc cleanup
2021-10-07 16:05:12 -04:00
GriffinR
846942ce48
Finish remaining symbols in link_rfu_2
2021-10-07 15:23:47 -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
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
GriffinR
4efa6c882a
Continue misc link documentation, rename reset_save_heap
2021-10-05 23:37:54 -04: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
GriffinR
6e62c057f5
Document remaining symbols in pokemon.c
2021-10-02 23:48:12 -04:00
GriffinR
739e7d3c31
Document summary screen sprite manager
2021-10-02 23:47:59 -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
GriffinR
001a25e49c
Merge pull request #1507 from GriffinRichards/doc-walda
...
Document Walda Phrase
2021-09-30 12:27:20 -04:00
Pokestia
38a4dea402
Rename Battle Weather flags
2021-09-30 12:08:20 +02: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
GriffinR
8a79ca3818
Document walda_phrase
2021-09-26 17:01:39 -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
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
GriffinR
cbf8863e5b
Clean up Lilycove Lady
2021-09-09 15:24:34 -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
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
GriffinR
8f5e2bbeba
Label swap line margin flag
2021-08-21 11:04:28 -04:00
ultima-soul
b620349da0
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-16 15:43:27 -07:00
GriffinR
dfdcfc1568
Document remaining functions in cable_club
2021-08-15 16:22:15 -04:00
GriffinR
e01ae55c13
Start more link_rfu_2 documentation
2021-08-15 15:13:42 -04: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
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
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
