DizzyEggg
|
94a3e80c8e
|
Remove redundant side macros/funcs (#3299)
Co-authored-by: gruxor <gruxor@proton.me>
|
2023-09-13 09:19:18 -03:00 |
|
Eduardo Quezada
|
0d5b00aaf2
|
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# data/maps/BattleFrontier_Lounge7/scripts.inc
# include/battle_anim.h
# include/battle_message.h
# include/constants/items.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_anim_throw.c
# src/battle_anim_utility_funcs.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_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/party_menu.h
# src/data/pokemon/tmhm_learnsets.h
# src/daycare.c
# src/field_specials.c
# src/hall_of_fame.c
# src/party_menu.c
# src/pokemon.c
# src/tv.c
|
2023-08-31 14:28:01 -04:00 |
|
GriffinR
|
41847cd5aa
|
STAT_ANIM constant usage
|
2023-08-04 16:27:45 -04:00 |
|
Eduardo Quezada
|
ad78dfcf68
|
Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
# src/battle_script_commands.c
# src/battle_util.c
|
2023-07-25 14:38:53 -04:00 |
|
DizzyEggg
|
fc37345c29
|
Fix wrong color in stat move animation
|
2023-07-21 10:42:39 +02:00 |
|
ghoulslash
|
7371a9e401
|
Add many gen 8 move animations (#2861)
* port many gen8 and 9 move anims from cfru
* fix thunder cage, shell smash, shelter anims. update anim credits
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-06-21 13:19:54 -04:00 |
|
Eduardo Quezada
|
b62e5aa72e
|
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214
# Conflicts:
# src/battle_main.c
# src/field_specials.c
# src/trade.c
|
2023-02-15 14:11:03 -03:00 |
|
Martin Griffin
|
bdb04da9a5
|
Refactor battle animations
|
2023-01-28 00:16:25 +00:00 |
|
GriffinR
|
347a02ace1
|
Sync trade
|
2022-12-15 15:40:59 -05:00 |
|
Eduardo Quezada
|
7c86bd5d08
|
Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826
# Conflicts:
# include/battle_interface.h
# src/battle_anim_effects_1.c
# src/battle_script_commands.c
# src/field_specials.c
|
2022-08-26 22:23:37 -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 |
|
GriffinR
|
c2d5dd2a1f
|
Additional battle anim sync
|
2022-08-19 11:51:13 -04:00 |
|
Eduardo Quezada
|
01558ff8f3
|
Struct pointers star standarizing
|
2022-07-29 11:15:33 -04:00 |
|
Eduardo Quezada
|
13672680b0
|
void pointer standarized
|
2022-07-29 10:52:35 -04:00 |
|
Eduardo Quezada
|
7b3401ee27
|
Standarized use of star in pointer types
|
2022-07-29 10:17:58 -04:00 |
|
Eduardo Quezada
|
f3bebcd12c
|
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
# Conflicts:
# include/battle_anim.h
# include/global.h
# include/pokemon.h
# src/battle_message.c
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
|
2022-07-22 22:57:02 -04:00 |
|
Eduardo Quezada D'Ottone
|
fe63dafcc1
|
Merge branch 'battle_engine' into BE_pretmerge
# Conflicts:
# src/battle_anim_fire.c
# src/battle_controller_player.c
|
2022-07-20 08:50:30 -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
|
34438e6bc4
|
Continue documenting generic arguments
|
2022-06-03 15:38:03 -04:00 |
|
GriffinR
|
a8437493c1
|
Document generic argument names in battle anim palettes
|
2022-06-01 12:25:01 -04:00 |
|
GriffinR
|
5e6d8a77e4
|
Document some generic argument names
|
2022-05-31 14:34:25 -04:00 |
|
LOuroboros
|
fa39dc76dc
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
|
2022-04-02 18:45:18 -03:00 |
|
ExpoSeed
|
f50a406b18
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
|
2022-03-22 12:56:23 -05:00 |
|
ghoulslash
|
7c2bbf1df3
|
fix struggle bug anim
|
2022-02-25 08:54:35 -05:00 |
|
ultima-soul
|
4f2e3bf214
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-12-17 21:23:54 -08: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
|
23bf41713c
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-12-01 20:17:08 -08: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
|
c1970a4bc8
|
Remove dead sub references
|
2021-11-17 15:47:47 -05:00 |
|
GriffinR
|
e3b6337c3a
|
Finish battle_anim_mons doc
|
2021-11-08 14:29:37 -05:00 |
|
GriffinR
|
d20341646a
|
Start battle_anim_mons doc
|
2021-11-08 11:46:13 -05:00 |
|
ghoulslash
|
85ce72a4d0
|
add shell smash anim
|
2021-10-14 10:47:39 -04:00 |
|
GriffinR
|
31b501e7eb
|
Start misc battle documentation
|
2021-10-08 16:39:46 -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
|
988320b89a
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-08-17 11:25:13 -07:00 |
|
ultima-soul
|
02c9e040df
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-08-11 16:33:10 -07:00 |
|
ExpoSeed
|
3ed06c2cc2
|
Remove remaining grey and replace with gray
|
2021-06-10 11:36:10 -05:00 |
|
ultima-soul
|
0a87adad1a
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-06-07 18:05:52 -07:00 |
|
ghoulslash
|
c356ffaed4
|
merge with be. fix null ptr check in GetBattleMoveSplit
|
2021-05-24 10:46:53 -06:00 |
|
ultima-soul
|
56fc420187
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-04-28 21:34:30 -07:00 |
|
GriffinR
|
e065c0c285
|
Label more unused battle anims
|
2021-04-24 18:26:25 -04:00 |
|
ultima-soul
|
be7acc919a
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-04-03 21:53:29 -07:00 |
|
ultima-soul
|
5bab9474dc
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-03-22 23:08:19 -07:00 |
|
Marcus Huderle
|
c900de35e7
|
Fix build and cleanup mistakes
|
2021-02-28 09:54:55 -06:00 |
|
Marcus Huderle
|
a85fada314
|
Document more battle anim effects
|
2021-02-28 09:54:55 -06:00 |
|
Marcus Huderle
|
c323e7f061
|
Document some battle anim funcs and data
|
2021-02-27 11:04:45 -06:00 |
|
ultima-soul
|
daf5e0167e
|
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-02-03 16:06:48 -08:00 |
|
GriffinR
|
3fd5e143a9
|
Misc battle anim documentation
|
2021-01-23 00:40:46 -05:00 |
|
GriffinR
|
a392cca928
|
Misc battle documentation
|
2021-01-23 00:40:31 -05:00 |
|