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
6598cb30bc
Document stat change animation
2023-08-08 23:56:16 -04:00
GriffinR
41847cd5aa
STAT_ANIM constant usage
2023-08-04 16:27:45 -04: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
4c57b84cd9
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230602
...
# Conflicts:
# graphics/pokemon/mawile/footprint.png
# src/battle_gfx_sfx_util.c
# src/fldeff_sweetscent.c
# src/pokedex.c
2023-06-02 11:45:28 -04:00
GriffinR
14f7e49099
Add some missing palette macro use
2023-05-25 15:09:16 -04:00
Martin Griffin
bdb04da9a5
Refactor battle animations
2023-01-28 00:16:25 +00:00
Eduardo Quezada
749225ace1
Matching merge from upstream pret
...
# Conflicts:
# graphics/interface/menu_info.png
# include/pokemon.h
# src/battle_ai_switch_items.c
# src/battle_anim_mons.c
# src/battle_anim_water.c
# src/battle_controller_opponent.c
# src/battle_gfx_sfx_util.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/data/pokemon/species_info.h
# src/pokemon.c
# src/pokemon_summary_screen.c
2023-01-20 12:31:54 -03:00
Martin Griffin
6fed961ed6
Write palette IDs in hex
2022-08-19 15:29:35 +01: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
BlackShark
75a44fdd79
use more true & false constants
2022-05-27 02:18:52 +02:00
GriffinR
593e2c9be0
Fix inconsistent static s/g names
2022-05-17 14:00:02 -04: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
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
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
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
GriffinR
e065c0c285
Label more unused battle anims
2021-04-24 18:26:25 -04:00
GriffinR
98ab546d3a
Label misc unused move anims
2021-04-13 04:04:09 -04:00
Marcus Huderle
a85fada314
Document more battle anim effects
2021-02-28 09:54:55 -06:00
Evan
752aca7698
finish z move anims
2020-11-29 09:22:31 -05:00
Evan
f114534ae3
z move anim/effect, black hole eclipse anim
2020-11-28 13:09:43 -05:00
GriffinR
dc3c2b72f2
Clean up move anim doc
2020-02-25 12:54:08 -06:00
GriffinR
208057d7ae
Document move anims S-Z
2020-02-25 12:54:08 -06:00
GriffinR
1ba12dc050
Document move anims I-S
2020-02-25 12:54:08 -06:00
GriffinR
501d0d3c18
Document move anims C-H
2020-02-25 12:54:08 -06:00
GriffinR
2756771958
More usage of ST_OAM constants and SPRITE macros
2019-12-06 19:05:44 -06:00
Sewef
07ac727c6d
Document Oamdata in battle_anim ( #838 )
2019-10-14 18:26:47 -05:00
DizzyEggg
b93581b519
Rename battle anim sprites
2019-04-06 10:14:48 -05:00
Marcus Huderle
462b196abc
Give battle_anim files appropriate names
2019-03-31 12:15:39 -05:00
