Eduardo Quezada
|
afcc1178b2
|
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
|
2022-08-22 20:30:45 -04:00 |
|
Eduardo Quezada
|
01558ff8f3
|
Struct pointers star standarizing
|
2022-07-29 11:15:33 -04:00 |
|
Eduardo Quezada
|
7b3401ee27
|
Standarized use of star in pointer types
|
2022-07-29 10:17:58 -04:00 |
|
ghoulslash
|
6b84a9f0b3
|
merge w be
|
2022-07-17 12:40:43 -04:00 |
|
ghoulslash
|
b33a8b0cb4
|
move ai score calc to STATE_TURN_START_RECORD so AI can consider move selection for item use
|
2022-06-05 11:09:04 -04:00 |
|
Sneed69
|
c60de5055d
|
remove IsMoveWithoutAnimation
|
2022-06-03 17:42:42 +03:00 |
|
ExpoSeed
|
5fd468f507
|
Review comments. Commented code removed, ShouldAIUseZMove moved to battle_ai_util and renamed to be consistent with other fns
|
2022-03-22 13:10:24 -05:00 |
|
ExpoSeed
|
65186b8c3a
|
Fix some style issues
|
2021-12-16 21:57:30 -06:00 |
|
ExpoSeed
|
d6747527da
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
|
2021-12-16 21:44:01 -06:00 |
|
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
|
fc15b0d5f0
|
Add controller buffer constants, finish misc battle doc
|
2021-10-13 16:21:39 -04:00 |
|
GriffinR
|
d8e65fc4b6
|
More battle doc, add battle window ids
|
2021-10-09 03:01:10 -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 |
|
ExpoSeed
|
0f99d9d4c6
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
|
2021-08-30 13:26:40 -05: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 |
|
ghoulslash
|
c356ffaed4
|
merge with be. fix null ptr check in GetBattleMoveSplit
|
2021-05-24 10:46:53 -06: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 |
|
Evan
|
0483114a05
|
merge and some fixes
|
2021-02-02 11:45:15 -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
|
74990a5a76
|
Sync player partner controller doc to player
|
2021-01-22 20:48:43 -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 |
|
Evan
|
0c648c0071
|
merge with be
|
2021-01-01 08:34:09 -07:00 |
|
GriffinR
|
2f426e0e7d
|
Index battle controller cmd tables
|
2020-12-29 17:21:58 -05: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 |
|
NamNguyenUTSA
|
ee59fab143
|
Allow player partner NPC's to mega evolve
(i.e., Steven at Mossdeep)
|
2020-12-11 08:31:00 -06:00 |
|
Evan
|
ce19e33cc4
|
handle double and multi battles
|
2020-12-01 13:43:15 -05: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 |
|