Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,684 Commits 1 Branch 0 Tags
Commit Graph

141 Commits

Author SHA1 Message Date
Eduardo Quezada
011ec16f1e Organized conffig files into their own folder and cleaned up 2022-11-14 11:03:49 -03:00
Eduardo Quezada
de32940fdf Further removed trailing whitespaces 2022-09-13 16:26:36 -03:00
Eduardo Quezada
3a6318f1d9 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/configRefactor 
# Conflicts:
#	include/constants/battle_config.h
 2022-09-06 15:20:54 -04:00
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
15d611ba65 Usage of BATTLE_PARTNER 2022-08-27 01:26:13 -04:00
Eduardo Quezada
1f5adf93c7 Cleaned up use of configs be almost exclusively preproc functions 2022-08-23 21:00: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
13672680b0 void pointer standarized 2022-07-29 10:52:35 -04:00
BuffelSaft
9d1800f53e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-01-27 17:18:51 +13:00
BuffelSaft
cca7ec8c58 Fix and rename GetMoveTargetType 
Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.
 2021-11-24 12:09:54 +13:00
BuffelSaft
fa0b5188bb Dynamic move targeting 
Properly implement Expanding Force by replacing all  instances that read move target from gBattleMoves with a function.
 2021-11-23 16:56:11 +13:00
ultima-soul
3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
Blackforest92
76ba9d835a pulled latest RHH battle_engine 08-11-2021 2021-11-08 16:38:42 +07:00
Blackforest92
b9c23f7c62 Update waterfall, trick room, & focus blast BG 2021-11-03 16:29:09 +07:00
Blackforest92
2d5ed4a1e2 Allow Giga Impact fadein background & upgrade its graphic 2021-11-02 12:53:11 +07:00
Blackforest92
9b6cd383a4 Optimized Rock Wrecker and Hurricane 2021-11-01 01:06:39 +07:00
Blackforest92
e59d0dd5cf clean Spacial Rend background 2021-10-31 22:58:43 +07:00
Blackforest92
799852ea77 Introduce alternate Steel Beam 2021-10-30 17:00:55 +07:00
GriffinR
934a7e7a5d
Merge pull request #1516 from GriffinRichards/doc-miscbattle 
Miscellaneous battle documentation
 2021-10-19 08:09:17 -04:00
GriffinR
f23e0beeba Rename battle anim cmds, move its data, name remaining symbols 2021-10-11 13:18:21 -04:00
GriffinR
28de627913 Add TRACKS_ALL, remove BGCntrlBitfield 2021-10-09 11:34:51 -04:00
GriffinR
d8e65fc4b6 More battle doc, add battle window ids 2021-10-09 03:01:10 -04:00
LOuroboros
91a68cd5db Implemented Primal Reversion 2021-10-09 00:36:41 -03:00
GriffinR
31b501e7eb Start misc battle documentation 2021-10-08 16:39:46 -04:00
LOuroboros
1b039062da Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-09-25 22:20:34 -03:00
ghoulslash
9d8672e3df merge with be 2021-09-16 13:12:59 -04:00
ultima-soul
02c9e040df Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-11 16:33:10 -07:00
LOuroboros
f1195e1884 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-07-27 09:08:52 -03:00
ghoulslash
a37d4c3da9 merge with be, give life dew jungle healing effect 2021-07-25 08:22:05 -06:00
PikalaxALT
810ca5f8ff Flatten pos fields in struct Sprite 2021-07-07 09:11:52 -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
LOuroboros
d6e89a99ce Corrected the name of an included header file 
include/constants/battle_moves.h doesn't exist.
The right header file to include was include/constants/moves.h instead.
 2021-03-14 12:54:57 -03:00
LOuroboros
68980cf18c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-03-10 03:58:21 -03:00
Marcus Huderle
a85fada314 Document more battle anim effects 2021-02-28 09:54:55 -06:00
GriffinR
ea748ff7f5
Merge pull request #1344 from GriffinRichards/doc-ec 
Document easy chat and mail, script.c cleanup, add/use some general constants
 2021-02-28 10:26:49 -05:00
Marcus Huderle
c323e7f061 Document some battle anim funcs and data 2021-02-27 11:04:45 -06:00
GriffinR
b04f0aaa2b Use SPRITE_NONE constant 2021-02-24 11:03:32 -05:00
GriffinR
a5852d57d1 Use TASK_NONE constant 2021-02-24 11:03:25 -05:00
Evan
6139b12a49 fix hp boxes not dissapearing 2021-02-02 23:30:08 -07:00
Evan
c009b51ae8 add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot 2021-01-28 13:27:00 -07:00
Evan
5c658c6950 config option for terrain bg change 2020-11-17 20:26:09 -07:00
Evan
c026f705b3 permanent terrain move bgs 2020-11-17 19:45:27 -07:00
LOuroboros
d66b2fc820 Fixed anim. settings labels in src/battle_anim.c 2020-11-06 21:37:04 -03:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
GriffinR
c42c1ab8c1 Document contest appeal 2020-08-15 14:32:30 -04:00
DizzyEggg
3cf091d635 Improve animations of moves hitting all foes 2020-06-26 23:28:46 +02:00
Evan
5d232c34fe fix a bunch of anims 2020-05-29 11:15:00 -06:00
Evan
ed4035caf1 fix anim particle config options 2020-05-26 08:54:02 -06:00
Evan
6c20a49dc6 animations for all moves 2020-05-25 00:37:32 -06:00
Evan
181bfbf5fd cfru particles and bgs 2020-05-22 10:10:10 -06:00