ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-08 10:33:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,273 Commits 1 Branch 0 Tags 235 MiB
0caf79f702
Commit Graph

63 Commits

Author SHA1 Message Date
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
GriffinR
2ec8f27811 Add missing usage of SOUND_PAN_* 2022-08-16 13:04:00 -04:00
Eduardo Quezada
01558ff8f3 Struct pointers star standarizing 2022-07-29 11:15:33 -04:00
Eduardo Quezada
a37d8b1346 Documented boolean uses 2022-07-25 14:59:14 -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
1ca1bff81c Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg 2022-06-03 15:43:21 -04:00
sphericalice
284e46927a Use the FREE_AND_SET_NULL macro where appropriate 2022-06-03 15:56:11 +01:00
GriffinR
a8437493c1 Document generic argument names in battle anim palettes 2022-06-01 12:25:01 -04: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
d20341646a Start battle_anim_mons doc 2021-11-08 11:46:13 -05:00
Eduardo Quezada D'Ottone
8773e552ac Organized config and added failsafe to AnimTask_SetCamouflageBlend 2021-11-06 19:24:06 -03:00
GriffinR
31b501e7eb Start misc battle documentation 2021-10-08 16:39:46 -04:00
Eduardo Quezada D'Ottone
e2bf660c97 Secret Power field terrain animations 2021-10-04 21:51:51 -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
e2f14d43db Fix Gravity's animation 2021-06-08 12:13:40 +02: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
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
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR
65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
GriffinR
c42c1ab8c1 Document contest appeal 2020-08-15 14:32:30 -04:00
PokeCodec
fb6f859edd semicolon 2020-07-27 19:17:34 -04:00
DizzyEggg
1a94d27fe6 Emergency Exit 2020-07-15 17:21:12 +02:00
DizzyEggg
b1d0bc1721 UTurn Battle Arena no switchin try number 2 2020-07-08 17:51:01 +02:00
DizzyEggg
e319c7da61 UTurn Battle Arena no switchin try number 2 2020-07-08 17:50:12 +02:00
DizzyEggg
093eca07b3 Volt Switch UTurn anim fix when cant switch out 2020-04-18 18:04:20 +02:00
DizzyEggg
6968124529 Merge battle anim documentation 2020-02-29 13:59:41 +01:00
GriffinR
51cd0ac081 Rename battle anim type files, remove unneeded ARG_RET_IDs 2020-02-25 12:54:08 -06:00
GriffinR
dc3c2b72f2 Clean up move anim doc 2020-02-25 12:54:08 -06:00
GriffinR
68dc68907b Label move anim data 2020-02-25 12:54:08 -06:00
GriffinR
efd53d080c Clean up battle anim C for doc 2020-02-25 12:54:08 -06:00
GriffinR
afa1ae2209 Finish documenting move anim scripts 2020-02-25 12:54:08 -06:00
GriffinR
208057d7ae Document move anims S-Z 2020-02-25 12:54:08 -06:00
GriffinR
0d651c7c9e Some battle anim review changes 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
6eb44dc507 Document move anims A-C 2020-02-25 12:54:08 -06:00
DizzyEggg
1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01:00
Sewef
def7a4a18a more battle_anims_effects_2 2019-10-20 12:29:08 -05:00
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
PikalaxALT
306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00