ultima-soul
7369f60c06
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
2021-12-03 17:30:45 -08:00
ultima-soul
23bf41713c
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-12-01 20:17:08 -08:00
ghoulslash
d108f77aa4
revert ai item usage code
2021-11-28 13:12:56 -05:00
ultima-soul
0312c5be8b
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-27 21:38:26 -08:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
GriffinR
1b35f9adad
Use specific name limits for string limit functions
2021-11-17 22:11:03 -05:00
GriffinR
f42eafc85b
Merge branch 'master' into doc-banim
2021-11-13 23:26:46 -05:00
GriffinR
e3b6337c3a
Finish battle_anim_mons doc
2021-11-08 14:29:37 -05:00
GriffinR
c4169cfd29
Disambiguate cry functions
2021-11-07 14:26:09 -05:00
GriffinR
54b254a829
Add CRY_MODE constants
2021-11-07 13:33:05 -05:00
GriffinR
934a7e7a5d
Merge pull request #1516 from GriffinRichards/doc-miscbattle
...
Miscellaneous battle documentation
2021-10-19 08:09:17 -04:00
GriffinR
fc15b0d5f0
Add controller buffer constants, finish misc battle doc
2021-10-13 16:21:39 -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
ghoulslash
c9743d1494
fix wild battles freezing
2021-10-06 10:05:49 -04: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
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
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
02c9e040df
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-11 16:33:10 -07:00
PikalaxALT
810ca5f8ff
Flatten pos fields in struct Sprite
2021-07-07 09:11:52 -04:00
DizzyEggg
540719c483
Add support for only one enemy pokemon in double battles start
2021-06-08 22:50:37 +02:00
ghoulslash
c3e28e9b1a
merge with be
2021-05-23 12:22:52 -06: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
62abcecc54
More usage of DISPLAY constants
2021-04-15 02:22:24 -04:00
GriffinR
f4d8a91ba4
Misc battle script cleanup
2021-04-03 14:07:31 -04:00
ultima-soul
5bab9474dc
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-03-22 23:08:19 -07:00
Evan
f3d975e239
merge with be
2021-02-12 08:59:55 -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
GriffinR
c106f7f130
Document battle_controller_opponent.c
2021-01-22 21:35:16 -05:00
GriffinR
63a7828772
Document battle_controller_player.c
2021-01-22 20:03:27 -05:00
GriffinR
4eca05ccf5
Document remainder of battle_controllers.c
2021-01-22 02:48:22 -05:00
GriffinR
b65980cd4e
Remove unused local variables and functions
2021-01-19 18:19:33 -05:00
GriffinR
b9e1b050e1
Label remaining battle types
2021-01-13 15:20:29 -05:00
GriffinR
2f426e0e7d
Index battle controller cmd tables
2020-12-29 17:21:58 -05:00
Evan
7988a1f41d
Ai_TryOnAlly and reorganize files
2020-12-20 14:47:20 -07:00
Aaron B-D
c4d83f0640
Fixed 2v1 Multi battles stalling indefinitely at the battle's intro
...
Fixes Issue #492
2020-09-25 17:40:38 -04:00
DizzyEggg
97d0643110
Merge with master
2020-09-08 12:48:28 +02:00
GriffinR
afb3472282
Minor battle_anim_throw cleanup
2020-08-30 15:11:44 -04:00
hondew
e46b35455d
Merge branch 'master' into pokeball-doc
2020-08-30 14:14:38 -04:00
hondew
328aecc96e
Document throwing pokeball
...
continue
Document more
Doc more funcs
Remove workspace
Document shiny stars
Document PokeBlock
Clean up
Clean more
2020-08-30 14:08:06 -04:00
GriffinR
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
DizzyEggg
ac499bc896
Merge with master
2019-12-09 08:16:18 +01:00
GriffinR
2756771958
More usage of ST_OAM constants and SPRITE macros
2019-12-06 19:05:44 -06:00
DizzyEggg
f05375112b
Erase isEgg field from battlemon, ability num to 2 bits
2019-08-21 11:56:49 +02:00
DizzyEggg
272fa07799
AI switch mons if all moves are not usable
2019-06-11 10:45:12 +02:00
DizzyEggg
f22f7866ac
Merge with master, fix conficts
2019-05-17 09:52:20 +02:00
DizzyEggg
33979f0fa6
use ability num instead of alt ability
2019-05-16 17:09:43 -05:00
DizzyEggg
f8713f9c15
Merge with master
2019-04-06 20:43:13 +02:00
DizzyEggg
b0223f691f
Clean up data headers
2019-04-05 07:53:23 -05:00
DizzyEggg
54ab6b43dc
Merge with master
2019-03-22 10:40:31 +01:00
