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
Eduardo Quezada
a37d8b1346
Documented boolean uses
2022-07-25 14:59:14 -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
a8437493c1
Document generic argument names in battle anim palettes
2022-06-01 12:25:01 -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
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
ecb13cdbf7
Merge pull request #1550 from GriffinRichards/doc-pokenav
...
Document Pokénav
2021-11-17 14:47:34 -05:00
Wiz
927f9d27df
Designate gBattleAnimBgImage_Attract and related as arrays
2021-11-14 17:08:03 -05:00
GriffinR
4590887359
Clean up some register constant use
2021-11-10 17:01:21 -05:00
GriffinR
e3b6337c3a
Finish battle_anim_mons doc
2021-11-08 14:29:37 -05:00
GriffinR
ae2602b5a5
Add missing BATTLER_COORD usage
2021-11-08 11:54:29 -05:00
GriffinR
d20341646a
Start battle_anim_mons doc
2021-11-08 11:46:13 -05: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
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
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
ExpoSeed
3ed06c2cc2
Remove remaining grey and replace with gray
2021-06-10 11:36:10 -05:00
ghoulslash
c356ffaed4
merge with be. fix null ptr check in GetBattleMoveSplit
2021-05-24 10:46:53 -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
f94540c2b8
Misc reg constant cleanup
2021-04-15 03:14:42 -04:00
GriffinR
8368b753df
More usage of WININ/OUT constants
2021-04-15 02:43:09 -04:00
GriffinR
62abcecc54
More usage of DISPLAY constants
2021-04-15 02:22:24 -04:00
GriffinR
f9f33b643e
Label unused move anims in anim_effects_2
2021-04-13 03:17:39 -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
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
Evan
752aca7698
finish z move anims
2020-11-29 09:22:31 -05:00
DizzyEggg
97d0643110
Merge with master
2020-09-08 12:48:28 +02:00
GriffinR
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
DizzyEggg
19699bee23
Merge pull request #390 from ghoulslash/battle_engine
...
add animations for all moves
2020-05-29 12:53:17 +02:00
DizzyEggg
013f9b6a17
merge wiith masteer and summary screen change
2020-05-29 12:50:54 +02:00
Evan
6c20a49dc6
animations for all moves
2020-05-25 00:37:32 -06:00
ghoulslash
13cf2cb217
Animation Particles, BGs, and gen 4 anims ( #384 )
...
* undo some revert(?)
* cfru particles and bgs
* remove commented out particles
2020-05-24 18:13:40 +02:00
GriffinR
f9e6f7540f
Use fixed point macros for math util
2020-05-24 08:28:02 -05:00
GriffinR
c6205b3df4
Document math_util.c
2020-05-24 08:28:02 -05:00
Evan
c18b5966bf
undo some revert(?)
2020-05-03 22:09:03 -06:00
DizzyEggg
060b795d8e
Merge with master
2020-04-11 19:48:24 +02:00
Sewef
685f120b5e
Fix 'AnimMovmentWaves' typo
2020-03-27 14:50:15 +01: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
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
