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 |
|
Evan
|
99d9a36860
|
add totem boosts
|
2020-11-19 10:35:37 -07:00 |
|
Evan
|
5c658c6950
|
config option for terrain bg change
|
2020-11-17 20:26:09 -07:00 |
|
Evan
|
c026f705b3
|
permanent terrain move bgs
|
2020-11-17 19:45:27 -07:00 |
|
ultima-soul
|
63bd0ec836
|
Remove Cacophony and fix some Gen 8 ability descriptions to fit.
|
2020-11-16 15:42:09 -08:00 |
|
ultima-soul
|
e32659d4bb
|
Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities.
|
2020-11-16 13:50:26 -08:00 |
|
Eduardo Quezada D'Ottone
|
4da357aef4
|
Fixed compatibility with Pokémon Expansion
|
2020-11-15 13:35:02 -03:00 |
|
ghoulslash
|
686ff59b11
|
Merge pull request #13 from AsparagusEduardo/PR-LGPE_IOA_Moves
LGPE & Isle of Armor move data.
|
2020-11-15 08:29:10 -07:00 |
|
Eduardo Quezada D'Ottone
|
f0154028ff
|
Review changes 2
|
2020-11-14 09:01:43 -03:00 |
|
Eduardo Quezada D'Ottone
|
e87f0f1ddb
|
Review changes
|
2020-11-13 14:51:50 -03:00 |
|
ultima-soul
|
236d7145ae
|
Merge pull request #1220 from AsparagusEduardo/BE-SteelResistances
Added config option for Steel type resistances.
|
2020-11-12 23:25:21 -08:00 |
|
ultima-soul
|
c3423b4212
|
Merge pull request #1206 from ExpoSeed/type-changing-moves
Refactor move effects for type changing moves
|
2020-11-12 19:10:48 -08:00 |
|
Eduardo Quezada D'Ottone
|
4b9d0d8e24
|
Added config option for Steel type resistances.
|
2020-11-11 17:48:02 -03:00 |
|
ExpoSeed
|
0912577ea1
|
Merge pull request #575 from AsparagusEduardo/BE-WishMegaEvo
Implemented Wish Mega Evolution
|
2020-11-11 11:05:06 -06:00 |
|
Eduardo Quezada D'Ottone
|
e021a4aa87
|
Critical Capture Config Option And Catching Charm #556 from ghoulslash
Critical Capture Config Option And Catching Charm
|
2020-11-10 17:31:08 -03:00 |
|
Eduardo Quezada D'Ottone
|
e6f8d57f08
|
Merge remote-tracking branch 'RHH/battle_engine' into BE-WishMegaEvo
# Conflicts:
# include/constants/battle_string_ids.h
|
2020-11-10 17:28:17 -03:00 |
|
LOuroboros
|
bb4f00737e
|
B_EXPANDED_INTIMIDATE->B_UPDATED_INTIMIDATE
|
2020-11-10 14:26:47 -03:00 |
|
Evan
|
de0518121e
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine
|
2020-11-10 09:00:30 -07:00 |
|
LOuroboros
|
a25190f357
|
A few things.
-Introduced a Gen. 8 styled text string for Intimidate
-Added an ability popup to BattleScript_IntimidatePrevented
|
2020-11-10 10:34:51 -03:00 |
|
LOuroboros
|
e179b9b5fe
|
Updated Intimidate to Gen. 8 standard
|
2020-11-10 10:18:16 -03:00 |
|
Eduardo Quezada D'Ottone
|
df4d927e31
|
Moved BATTLE_ENGINE define to global.h to fix reading from other branches
|
2020-11-09 12:45:31 -03:00 |
|
Eduardo Quezada D'Ottone
|
ddb6142709
|
Review changes 3.
|
2020-11-08 21:08:58 -03:00 |
|
Eduardo Quezada D'Ottone
|
35d5324324
|
Review changes.
|
2020-11-08 21:02:34 -03:00 |
|
Evan
|
03f480fa17
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine
|
2020-11-08 15:21:48 -07:00 |
|
Evan
|
980f208b78
|
use NATIONAL_DEX_COUNT for critical capture odds
|
2020-11-08 14:07:43 -07:00 |
|
ExpoSeed
|
d2566c8988
|
Refactor Multi-Attack, Judgment, and Techno Blast to use the same move effect
|
2020-11-07 23:34:04 -06:00 |
|
ultima-soul
|
99fdc13e61
|
Merge branch 'master' into battle_engine_sync
|
2020-11-07 15:59:20 -08:00 |
|
Eduardo Quezada D'Ottone
|
09a5d6c722
|
Implemented Wish Mega Evolution
|
2020-11-07 10:13:32 -03:00 |
|
Evan
|
b3d1e8b5b8
|
turn crit capture odds into a ratio
|
2020-11-03 08:57:11 -07:00 |
|
Evan
|
e7372e7c5b
|
add B_ prefix to critical capture configs
|
2020-11-01 21:50:34 -07:00 |
|
Evan
|
59692e8e7f
|
styling fix
|
2020-11-01 21:08:58 -07:00 |
|
Evan
|
a6c3d950f6
|
critical capture config option and catching charm
|
2020-11-01 16:15:42 -07:00 |
|
Eduardo Quezada D'Ottone
|
5a201f006f
|
More exp options in battle_config (#530) from MandL27
|
2020-11-01 19:41:29 -03:00 |
|
ExpoSeed
|
1b65e1a1f0
|
Merge pull request #520 from ghoulslash/battle_engine
Add Toggle Healthbox Visibility Feature
|
2020-10-31 23:07:39 -05:00 |
|
aaaaaa123456789
|
1c3d75f673
|
Merge branch 'master' into reverts
|
2020-10-26 12:16:36 -03:00 |
|
Eduardo Quezada
|
ae60ae8a2d
|
Review changes.
|
2020-10-24 03:07:45 -03:00 |
|
Eduardo Quezada
|
b5834b617d
|
Merge branch 'BattleEngine' into PR-LGPE_IOA_Moves
# Conflicts:
# src/data/text/move_descriptions.h
|
2020-10-24 00:36:29 -03:00 |
|
Kurausukun
|
44c2d15ca9
|
re-match sub_81C79BC (from #1177)
also re-define RBG macros
|
2020-10-23 22:07:30 -04:00 |
|
Eduardo Quezada
|
d596fa7e12
|
Merge remote-tracking branch 'RHH/battle_engine' into PR-MoveSplitOption
# Conflicts:
# include/battle_util.h
# include/constants/battle_config.h
# src/battle_util.c
|
2020-10-23 21:49:59 -03:00 |
|
Kurausukun
|
90211248af
|
re-match Cmd_unknown_24 (from #1140)
changes to data structs are necessary. other things that look
unnecessary, like the order of operands, are also necessary. fuck this
function.
|
2020-10-23 20:47:10 -04:00 |
|
ExpoSeed
|
34729ce99c
|
Merge pull request #150 from AsparagusEduardo/PR-MoreBattleConfigs
More Battle Config options
|
2020-10-23 10:59:12 -05:00 |
|
MandL27
|
6d5547bdb4
|
fix indentation
|
2020-10-21 16:20:49 -04:00 |
|
MandL27
|
efdaa25640
|
Add B_SCALED_EXP and B_SPLIT_EXP
|
2020-10-21 16:19:07 -04:00 |
|
LOuroboros
|
503134167a
|
Review corrections
|
2020-10-21 15:01:53 -03:00 |
|
LOuroboros
|
4794c63066
|
Reincorporated badge based stat boosts
|
2020-10-21 12:57:57 -03:00 |
|
Eduardo Quezada
|
8f9659f846
|
Fixed Pika Papow's name.
|
2020-10-19 11:45:54 -03:00 |
|
Eduardo Quezada
|
a23e9a8a37
|
Adapting move changes (part 2) + Hyperspace Fury type.
|
2020-10-18 12:07:11 -03:00 |
|
Eduardo Quezada
|
3342573881
|
Updated name of setting.
|
2020-10-18 11:19:39 -03:00 |
|
Eduardo Quezada
|
b1903af8c1
|
Adapting move changes (part 1)
|
2020-10-17 23:08:39 -03:00 |
|
Eduardo Quezada
|
faca6c4867
|
Organized interface settings into their own category.
|
2020-10-17 14:31:58 -03:00 |
|
Eduardo Quezada
|
815b525855
|
Configurable double wild battle chance, surfing double battles and flag for forcing them.
|
2020-10-17 14:25:43 -03:00 |
|
Eduardo Quezada
|
6c9f864651
|
Tweaking battle_config to accomodate pokemon_config and item_config
|
2020-10-17 10:52:44 -03:00 |
|
Evan
|
bd26919acc
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine
|
2020-10-15 18:25:21 -06:00 |
|
Eduardo Alvaro Quezada D'Ottone
|
1df696c1fb
|
Merge pull request #17 from LOuroboros/move_updates
Updated many moves' data to Gen. 8 standards
|
2020-10-15 20:56:58 -03:00 |
|
Eduardo Quezada
|
a6e88b82ee
|
Review changes and option to hide split icon.
|
2020-10-15 20:15:44 -03:00 |
|
LOuroboros
|
e4635525e7
|
Renamed the HOLD_EFFECT_EV_BOOST label
|
2020-10-15 04:52:03 -03:00 |
|
LOuroboros
|
5257ef70df
|
Oopsie, the Gen. 8 effect should be the default one
|
2020-10-15 04:31:44 -03:00 |
|
LOuroboros
|
fcc3c6c6ba
|
Added a way to quickly switch Rapid Spin's move effect from Gen. 3 to 8
|
2020-10-15 04:21:40 -03:00 |
|
Eduardo Quezada
|
0d39b29691
|
Option to use Gen 3 Physical/Special split.
|
2020-10-15 00:16:50 -03:00 |
|
Eduardo Quezada
|
47259092e3
|
LGPE & Isle of Armor move data.
|
2020-10-14 21:50:22 -03:00 |
|
Evan
|
c9504ca749
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine
|
2020-10-13 11:34:41 -06:00 |
|
ExpoSeed
|
9e2c8a95c1
|
Sync bev2 with pret
|
2020-10-11 01:01:47 -05:00 |
|
Evan
|
5ab17cc713
|
Merge branch 'battle_engine_v2' of https://github.com/dizzyeggg/pokeemerald into battle_engine
|
2020-10-09 09:13:17 -06:00 |
|
GriffinR
|
65a4e06737
|
Add ITEM6_HEAL constants, change move flags to shifts
|
2020-10-05 18:48:51 -04:00 |
|
GriffinR
|
66bd1e6d3f
|
Use constants for item digits
|
2020-09-25 11:18:52 -04:00 |
|
aaaaaa123456789
|
7dc95a0103
|
Undo PokeCodec's PRs
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.
Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
|
2020-09-13 06:30:55 -03:00 |
|
DizzyEggg
|
97d0643110
|
Merge with master
|
2020-09-08 12:48:28 +02:00 |
|
PokeCodec
|
3d87a88067
|
Make battle pyramid defines into enums
|
2020-09-04 19:49:53 -04:00 |
|
PokeCodec
|
3a2a2b6ba9
|
Fix issues according to feedback
|
2020-09-04 19:49:53 -04:00 |
|
PokeCodec
|
d4158e490a
|
Match more functions
|
2020-09-04 19:49:53 -04:00 |
|
PikalaxALT
|
135ed6a162
|
Merge pull request #1163 from GriffinRichards/doc-animthrow
Minor battle_anim_throw cleanup
|
2020-09-04 19:44:33 -04:00 |
|
GriffinR
|
f5495d1220
|
Give proper names to underwater maps
|
2020-09-01 03:03:14 -04:00 |
|
GriffinR
|
afb3472282
|
Minor battle_anim_throw cleanup
|
2020-08-30 15:11:44 -04:00 |
|
GriffinR
|
a9719c92bf
|
Merge pull request #1160 from kiliwily/master2
add MAX_LEVEL_UP_MOVES macro
|
2020-08-28 19:18:03 -04:00 |
|
kiliwily
|
c68c2b66e8
|
add more macros
|
2020-08-29 01:02:20 +02:00 |
|
GriffinR
|
09cfed64b5
|
Merge pull request #1146 from GriffinRichards/rename-songs
Give songs meaningful english names
|
2020-08-28 16:14:21 -04:00 |
|
kiliwily
|
5e7b6a089c
|
add MAX_LEVEL_UP_MOVES macro
|
2020-08-28 20:36:07 +02:00 |
|
Thomas Winwood
|
58786a7ac0
|
Add MAX_PER_STAT_EVS macro
|
2020-08-28 02:25:02 +01:00 |
|
DizzyEggg
|
f70a9ce153
|
Merge with master
|
2020-08-27 12:01:28 +02:00 |
|
GriffinR
|
fbb70b3727
|
Document contest AI scripts
|
2020-08-21 14:57:17 -04:00 |
|
GriffinR
|
ee72696b53
|
Sync encounter musics with encounter music types
|
2020-08-20 21:03:24 -04:00 |
|
GriffinR
|
d356e35b64
|
Fix incorrect pike curtain SE names
|
2020-08-20 20:23:08 -04:00 |
|
GriffinR
|
3014241179
|
Give songs meaningful english names
|
2020-08-20 19:06:14 -04:00 |
|
GriffinR
|
6c34effda9
|
Merge pull request #1138 from GriffinRichards/doc-contest
Document contest
|
2020-08-20 16:03:47 -04:00 |
|
PokeCodec
|
e27975afaa
|
Match battle script commands by correcting a function and the pokemon struct
|
2020-08-18 22:05:01 -04:00 |
|
GriffinR
|
503dafd210
|
Fix wallys parents misnamed as uncle/aunt
|
2020-08-18 17:51:41 -04:00 |
|
GriffinR
|
65bd2faf94
|
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest
|
2020-08-16 05:59:10 -04:00 |
|
GriffinR
|
2749948eeb
|
Clean up contest doc
|
2020-08-16 05:52:17 -04:00 |
|
GriffinR
|
e98e4652fd
|
Document contest live updates
|
2020-08-16 05:18:09 -04:00 |
|
GriffinR
|
70851d9083
|
Add MAP_SCRIPT descriptions
|
2020-08-11 15:50:09 -04:00 |
|
GriffinR
|
8b95e1964b
|
Merge pull request #1121 from GriffinRichards/doc-roulette
Document roulette
|
2020-08-10 17:18:09 -04:00 |
|
GriffinR
|
078c341b2b
|
Merge pull request #1122 from GriffinRichards/clean-battlemsg
Add stat stage constants, clean up misc battle msg data
|
2020-08-10 14:29:27 -04:00 |
|
GriffinR
|
5e8ffff62f
|
Add stat stage constants
|
2020-08-04 20:38:57 -04:00 |
|
PikalaxALT
|
03eba6a62c
|
Merge pull request #1116 from GriffinRichards/doc-slotmachine
Document slot machine
|
2020-08-01 09:56:44 -04:00 |
|
GriffinR
|
22b5b6b074
|
Start documenting roulette
|
2020-07-30 19:37:16 -04:00 |
|
GriffinR
|
7ada56f039
|
Merge pull request #1085 from GriffinRichards/doc-overworld
Document field effects / misc overworld
|
2020-07-28 17:54:25 -04:00 |
|
GriffinR
|
1f4813bfd2
|
Document slot machine funcs
|
2020-07-28 17:38:05 -04:00 |
|
DizzyEggg
|
0066640a1e
|
Merge with master
|
2020-07-27 14:51:39 +02:00 |
|
GriffinR
|
36a4764a78
|
Document some slot machine data
|
2020-07-26 02:15:59 -04:00 |
|
GriffinR
|
2439f42de4
|
Add warnings to generated files
|
2020-07-24 03:43:37 -04:00 |
|
GriffinR
|
aca50c87be
|
Continue new contest documentation
|
2020-07-24 00:14:53 -04:00 |
|
GriffinR
|
52a4428ba6
|
Begin new contest documentation
|
2020-07-23 17:55:40 -04:00 |
|
GriffinR
|
4a42e2a710
|
Merge branch 'master' into doc-overworld
|
2020-07-23 10:31:52 -04:00 |
|
GriffinR
|
813f0c724f
|
Sync flags with pokeruby
|
2020-07-22 18:00:41 -04:00 |
|
GriffinR
|
af09e73d67
|
Merge branch 'master' into doc-overworld
|
2020-07-18 20:24:09 -04:00 |
|
GriffinR
|
1a27af8855
|
Merge pull request #1100 from GriffinRichards/clean-battlescrdata
Misc battle and battle palace documentation
|
2020-07-18 20:22:44 -04:00 |
|
GriffinR
|
fb402725c6
|
Convert more battle constants to bit shifts
|
2020-07-18 18:39:38 -04:00 |
|
GriffinR
|
aba42513d3
|
Clean up some battle scr cmd data
|
2020-07-18 18:10:15 -04:00 |
|
GriffinR
|
96fd719a19
|
Merge pull request #1081 from GriffinRichards/add-localids
Add local object event ids for referenced objects
|
2020-07-17 18:18:47 -04:00 |
|
DizzyEggg
|
14daa9f4a5
|
Inverse battles
|
2020-07-17 20:53:22 +02:00 |
|
DizzyEggg
|
42f48d1a61
|
Power Construct
|
2020-07-16 15:40:56 +02:00 |
|
Evan
|
b428b39fd1
|
hide hp boxes during anims
|
2020-07-15 16:23:44 -06:00 |
|
DizzyEggg
|
1a94d27fe6
|
Emergency Exit
|
2020-07-15 17:21:12 +02:00 |
|
DizzyEggg
|
62dc94e9c8
|
Merge with master
|
2020-07-15 10:13:19 +02:00 |
|
GriffinR
|
e129d04b93
|
Merge branch 'master' into doc-overworld
|
2020-07-15 00:40:47 -04:00 |
|
GriffinR
|
3c356a1d7a
|
Merge pull request #1082 from GriffinRichards/add-flagvarsave
Allow flag/var counts to be updated alongside values
|
2020-07-14 19:58:38 -04:00 |
|
GriffinR
|
c177872c9c
|
Merge pull request #1080 from AsparagusEduardo/EndBalls
Created constant for easier Ball Expansion.
|
2020-07-14 19:56:20 -04:00 |
|
ghoulslash
|
8f669bb57d
|
Add critical capture (#402)
* add critical capture
* synax and format fixes
|
2020-07-14 17:47:15 +02:00 |
|
DizzyEggg
|
2c9b4f4b17
|
Show targets in double battles while hitting multiple pokemon at once
|
2020-07-14 10:39:54 +02:00 |
|
Eduardo Quezada
|
b31efcd6e3
|
Renamed constant,
|
2020-07-12 01:49:32 -04:00 |
|
DizzyEggg
|
4c3f40a361
|
Merge with master
|
2020-07-11 12:59:23 +02:00 |
|
GriffinR
|
beeb673ba1
|
Merge branch 'master' of https://github.com/pret/pokeemerald into add-flagvarsave
|
2020-07-08 16:03:32 -04:00 |
|
GriffinR
|
ebb6c4ee66
|
Merge branch 'master' into doc-overworld
|
2020-07-08 15:51:58 -04:00 |
|
GriffinR
|
89bcf3cbd9
|
Merge branch 'master' into add-localids
|
2020-07-08 15:47:45 -04:00 |
|
GriffinR
|
431c60c92c
|
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti
|
2020-07-08 15:45:31 -04:00 |
|
GriffinR
|
c0bc7e8f7b
|
Fix elevator metatile typo
|
2020-07-06 16:02:49 -04:00 |
|
GriffinR
|
1ce929157f
|
Clean up field effect doc
|
2020-07-02 05:05:13 -04:00 |
|
GriffinR
|
abdf7cbf02
|
Label fishing effect functions
|
2020-06-29 16:53:38 -04:00 |
|
DizzyEggg
|
08a5ba0db2
|
Sitrus berry gen4 effect code
|
2020-06-29 18:56:19 +02:00 |
|
DizzyEggg
|
5ddb4634f5
|
berries work like in gen4
|
2020-06-29 18:04:13 +02:00 |
|
GriffinR
|
4ea6992172
|
Continue documenting overworld/field effects
|
2020-06-29 01:26:29 -04:00 |
|
DizzyEggg
|
3bdf675221
|
Hopefully illusion works as intended now
|
2020-06-28 19:45:48 +02:00 |
|
Eduardo Alvaro Quezada D'Ottone
|
9fb073ca23
|
Some cleanup (#454)
* Toxic Thread doesn't have power.
* Added missing commas.
* Autotomize typo.
It wasn't until today that I learned that autotomize was a word.
|
2020-06-27 11:21:13 +02:00 |
|
DizzyEggg
|
548a43f8d9
|
Rocky Helmet before Knock Off
|
2020-06-25 16:15:11 +02:00 |
|
GriffinR
|
2ed1f7c6f9
|
Byte-align daily flags
|
2020-06-24 18:05:22 -04:00 |
|
GriffinR
|
06025e887f
|
Allow flag/var counts to be updated alongside values
|
2020-06-24 17:00:19 -04:00 |
|
GriffinR
|
18d57a3802
|
Document some overworld and field effects
|
2020-06-23 15:48:53 -04:00 |
|
GriffinR
|
fac6288156
|
Add local object event ids for referenced objects
|
2020-06-22 17:18:58 -04:00 |
|
DizzyEggg
|
f2d2c1b76f
|
Merge pull request #438 from LOuroboros/effect_sleep_hit
Implemented Relic Song's effect
|
2020-06-22 10:10:15 +02:00 |
|
Eduardo Quezada
|
7244b80fc6
|
Created constant for easier Ball Expansion.
|
2020-06-21 02:36:46 -04:00 |
|
GriffinR
|
24569583e4
|
Document contest results
|
2020-06-18 17:50:13 -04:00 |
|
LOuroboros
|
33a45ba181
|
Implemented Relic Song's effect
|
2020-06-16 07:06:38 -03:00 |
|
LOuroboros
|
5f763a8380
|
Fixed Freeze Shock's 1st turn battle string
|
2020-06-16 04:11:37 -03:00 |
|
GriffinR
|
c2a07276ae
|
Merge branch 'master' into doc-link
|
2020-06-13 16:15:11 -04:00 |
|