Commit Graph

494 Commits

Author SHA1 Message Date
LOuroboros
fc7f1acf20 Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser 2021-10-27 11:13:59 -03:00
Eduardo Quezada D'Ottone
d4eaa73292 Added check in IsRunningFromBattleImpossible. 2021-10-26 20:45:59 -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
76b6250104
Merge branch 'battle_engine' into plasmaFists 2021-10-23 11:06:34 -03: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
ghoulslash
fa8fa32259
Update src/battle_main.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-10-19 11:52:50 -04:00
ghoulslash
ebc86bb247 update baton pass status3 bits 2021-10-19 09:38:27 -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
LOuroboros
d9b8e11a9c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE 2021-10-19 07:47:42 -03:00
Eduardo Quezada D'Ottone
3c6101d957 Clear gStatuses4 data 2021-10-18 21:55:16 -03:00
GriffinR
e1900efe1e
Merge branch 'master' into doc-miscbattle 2021-10-15 22:46:43 -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
GriffinR
fc15b0d5f0 Add controller buffer constants, finish misc battle doc 2021-10-13 16:21:39 -04:00
ghoulslash
5108d173fc fix protect struct fields being set during ai calcs 2021-10-13 10:11:02 -04:00
ghoulslash
3248bd796a add quick draw 2021-10-12 21:49:18 -04:00
GriffinR
b0598b1aef Clean up recorded_battle, add MOVE_IS_PERMANENT 2021-10-12 01:14:17 -04:00
Eduardo Quezada D'Ottone
cf6e3873b4 Moved Electrified to Status4. 2021-10-10 01:13:23 -03: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
GriffinR
31b501e7eb Start misc battle documentation 2021-10-08 16:39:46 -04:00
GriffinR
a2655ba9ab
Merge branch 'master' into doc-union 2021-10-07 16:10:35 -04:00
ghoulslash
658235c03d merge with be 2021-10-06 14:33:26 -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
040e56b758 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_ai 2021-10-06 10:05:55 -04:00
Eduardo Quezada D'Ottone
43d42c95cf Terrain Pulse effect implemented 2021-10-04 22:45:37 -03:00
GriffinR
6e62c057f5 Document remaining symbols in pokemon.c 2021-10-02 23:48:12 -04:00
Eduardo Quezada D'Ottone
6208995606 Fixed Run Away. 2021-10-02 15:52:55 -03:00
LOuroboros
43e73ac576 Fixed Safari Zone 2021-10-01 05:25:25 -03: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
GriffinR
a66d7e1b43 Document some single-remaining symbols 2021-09-24 17:14:20 -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
Eduardo Quezada D'Ottone
13a464ffa4
Merge pull request #1673 from ghoulslash/gen8_move_effects
Gen8 move effects Fixes
2021-09-23 18:04:20 -03:00
ghoulslash
2f69748e0d merge with be 2021-09-23 14:38:01 -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
380e1e470c Applied use of TRUE and FALSE for flags. 2021-09-22 23:29:00 -03:00
ghoulslash
936f2c7bcb fix eject pack weak armor special case 2021-09-22 21:51:37 -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
ghoulslash
fc84ebbd3e redo prankster checks to handle assist 2021-09-22 08:06:42 -04: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
af8d86f0c9 merge with be 2021-09-16 13:33:35 -04:00
ghoulslash
9d8672e3df merge with be 2021-09-16 13:12:59 -04:00
ghoulslash
95af97593b fix some comment styling. fix throat spray for multi-target moves 2021-09-14 11:53:35 -04:00
LOuroboros
3113e4fa12 Moved stat recalculation to HandleEndTurn_FinishBattle 2021-09-06 07:40:35 -03: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
ghoulslash
e4fb9c4593 fix throwing ball in wild doubles 2021-08-31 12:51:03 -04: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
dfdcfc1568 Document remaining functions in cable_club 2021-08-15 16:22:15 -04: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
BuffelSaft
f0cb6190e0 Implement Burmy form change
Burmy changes form based on where it last battled.
2021-08-07 20:56:10 +12:00
ghoulslash
0a0687ae78 add smart wild AI 2021-07-27 09:49:39 -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
45d4cee243 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball 2021-07-18 11:11:03 -06:00
BuffelSaft
90fdb74ccb Remove UndoFormChangeOnSwitch
Handle switching out Mimikyu Busted in UndoFormChange.
2021-07-16 17:56:53 +12:00
PikalaxALT
810ca5f8ff Flatten pos fields in struct Sprite 2021-07-07 09:11:52 -04:00
ghoulslash
d28ac33b0e fix throw last used ball action turn order checks 2021-07-04 09:28:59 -06:00
ghoulslash
c06029bc72 add last used ball 2021-06-25 13:37:59 -06:00
GriffinR
6d92b466e7 Add missing use of F_TRAINER_FEMALE 2021-06-25 11:50:09 -04:00
DizzyEggg
4b29ae39ad Allow one mon double battles 2021-06-08 16:40:47 +02: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
c876de5a5b Done! Merge branch 'battle_engine' into Photon_Geyser 2021-06-05 17:40:06 -07: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
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
gAlfonso-bit
9a195c0fef Cherry-pick roamer bug fix from pokefirered
Adapted https://github.com/pret/pokefirered/blob/master/src/battle_main.c#L3831 to pokeemerald
2021-05-13 11:23:42 -05:00
ultima-soul
56fc420187 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-28 21:34:30 -07: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
f94540c2b8 Misc reg constant cleanup 2021-04-15 03:14:42 -04:00
GriffinR
62abcecc54 More usage of DISPLAY constants 2021-04-15 02:22:24 -04:00
Marcus Huderle
e92d2005c4 Use designated initializers for gTypeNames 2021-04-12 17:41:16 -05:00
ExpoSeed
2bbab03eba
Merge pull request #1430 from LOuroboros/decap_battle_types
Decapped the in battle type strings
2021-04-04 15:11:13 -05: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
LOuroboros
66e86e3aac Decapped the in battle type strings 2021-03-31 00:47:57 -03:00
GriffinR
8c6e89e994 Bit shifts from hex to decimal 2021-03-30 17:38:09 -04:00
ghoulslash
a595b213b4 merge with be 2021-03-28 17:29:22 -06:00
ultima-soul
5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07:00
PikalaxALT
925e68c03f Update newly named fields 2021-03-15 15:22:41 -04:00
PikalaxALT
8d4dcb228a More documentation in battle_main 2021-03-12 16:55:58 -05:00
PikalaxALT
e32a1571af Resolve link comm buffers in gBattleStruct 2021-03-12 15:37:31 -05:00
PikalaxALT
e6b1b97aa1 Nonmatching resoltuion
- Fix fakematch in Cmd_get_used_held_item
- Remove `static` overrides in MODERN in four objects
2021-03-12 13:55:07 -05: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
bcb6fe154b
Update src/battle_main.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:00 -07:00