Eduardo Quezada
|
5403cd036e
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902
# Conflicts:
# include/battle.h
# include/battle_controllers.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controllers.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
|
2022-09-02 23:24:08 -04:00 |
|
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
|
3bc2cf921c
|
Sync src/battle_controllers.c with pokefirered
|
2022-08-18 14:30:22 -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 |
|
Eduardo Quezada D'Ottone
|
e791cf90ad
|
Merge tag 'pretmaster' into BE_pretmerge2
# Conflicts:
# data/battle_anim_scripts.s
# include/battle_anim.h
# include/battle_controllers.h
# include/battle_interface.h
# include/battle_main.h
# include/battle_setup.h
# include/constants/battle_anim.h
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_anim_fire.c
# src/battle_anim_normal.c
# src/battle_controllers.c
# src/battle_dome.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/pokemon.c
|
2022-07-15 12:58:46 -04:00 |
|
GriffinR
|
5e6d8a77e4
|
Document some generic argument names
|
2022-05-31 14:34:25 -04: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
|
e1900efe1e
|
Merge branch 'master' into doc-miscbattle
|
2021-10-15 22:46:43 -04:00 |
|
GriffinR
|
fc15b0d5f0
|
Add controller buffer constants, finish misc battle doc
|
2021-10-13 16:21:39 -04:00 |
|
GriffinR
|
dfdcfc1568
|
Document remaining functions in cable_club
|
2021-08-15 16:22:15 -04:00 |
|
DizzyEggg
|
4b29ae39ad
|
Allow one mon double battles
|
2021-06-08 16:40:47 +02:00 |
|
DizzyEggg
|
4b744374c8
|
Allow larger exp gains
|
2021-06-03 23:17:44 +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
|
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 |
|
Evan
|
c003f1c023
|
check move effectiveness with status effects
|
2021-01-26 15:41:59 -07: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
|
b9e1b050e1
|
Label remaining battle types
|
2021-01-13 15:20:29 -05:00 |
|
luckytyphlosion
|
cb7b77500f
|
Just remove the commented out function and notes.
|
2021-01-12 18:52:37 -05:00 |
|
luckytyphlosion
|
f626fac9dc
|
Fix AI corruption bug.
|
2021-01-12 18:43:16 -05:00 |
|
SphericalIce
|
3c2a33b9b2
|
Use constants for max IVs & the random IV generation flag
|
2021-01-07 22:13:14 +00: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 |
|
ultima-soul
|
e32659d4bb
|
Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities.
|
2020-11-16 13:50:26 -08:00 |
|
ExpoSeed
|
9e2c8a95c1
|
Sync bev2 with pret
|
2020-10-11 01:01:47 -05:00 |
|
GriffinR
|
5259898325
|
Replace POKEMON_SLOTS_NUMBER
|
2020-10-01 17:07:12 -05:00 |
|
DizzyEggg
|
4c3f40a361
|
Merge with master
|
2020-07-11 12:59:23 +02:00 |
|
GriffinR
|
e6f5c4f264
|
Sync link_rfu_2.c
|
2020-06-07 12:54:50 -04:00 |
|
GriffinR
|
3f97763181
|
Document cable_club.c
|
2020-06-06 16:10:03 -04:00 |
|
GriffinR
|
4fe507e453
|
Document union_room.c
|
2020-05-31 13:11:18 -04:00 |
|
ultima-soul
|
9ee5db6a96
|
Expand ability ids to u16. Thanks to ghoulslash for some assistance!
|
2020-05-18 14:54:12 -07:00 |
|
DizzyEggg
|
4c9ea32d19
|
Merge with master
|
2019-12-30 18:52:23 +01:00 |
|
GriffinR
|
ddfa0c6298
|
Document Battle Tower scripts
|
2019-12-17 20:56:13 -05:00 |
|
DizzyEggg
|
1d8cc9b741
|
Fix merge conflicts
|
2019-11-03 19:55:19 +01:00 |
|
GriffinR
|
aec7eb6089
|
Clean up party_menu doc
|
2019-10-31 14:11:55 -04:00 |
|
GriffinR
|
e01ec84837
|
Document party_menu second pass
|
2019-10-31 03:25:56 -04:00 |
|
GriffinR
|
6db014cc32
|
Document party_menu first pass
|
2019-10-25 15:41:06 -04:00 |
|
DizzyEggg
|
bae5d2038f
|
Update with master
|
2019-10-10 16:18:48 +02:00 |
|
PikalaxALT
|
1e1a4076f0
|
Merge pull request #798 from GriffinRichards/constants-baction
Use misc battle constants
|
2019-09-05 09:06:31 -04:00 |
|
GriffinR
|
c647a8329f
|
Use gBattlerPositions constants
|
2019-09-04 17:45:04 -04:00 |
|
GriffinR
|
5d30304f4e
|
Use OTID constants for CreateMon
|
2019-08-30 22:13:14 -05:00 |
|
DizzyEggg
|
c219776034
|
Merge with master
|
2019-08-04 23:09:28 +02:00 |
|
DizzyEggg
|
ff2dcf5413
|
Two fakematches out
|
2019-07-29 21:09:05 +02:00 |
|
DizzyEggg
|
fddb5159b4
|
Merge with master
|
2019-03-05 21:46:45 +01:00 |
|
Phlosioneer
|
e75f45dbcf
|
Reverse engineered many of the multiplayer events
Some corrections to the way events are handled and identified.
|
2019-02-10 20:42:50 -05:00 |
|