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
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
Sneed69
c60de5055d
remove IsMoveWithoutAnimation
2022-06-03 17:42:42 +03:00
GriffinR
5e6d8a77e4
Document some generic argument names
2022-05-31 14:34:25 -04:00
sneed
881e7e70ec
Generalize usage of castformPalette
...
https://github.com/pret/pokeemerald/pull/1663
2022-05-19 15:23:09 +03:00
sneed
0424e37252
Fix cherrim + castform interaction
2022-05-19 14:20:34 +03:00
GriffinR
91baf08638
Generalize usage of castformPalette
2022-05-18 22:11:51 -04:00
LOuroboros
f82c946ff3
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge
2022-04-03 13:26:27 -03: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
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
TheXaman
a334f7f5e0
changed all missed ones to #if P_ENABLE_DEBUG == TRUE @LOuroboros
2021-12-13 18:58:13 +01:00
TheXaman
d300b8f56c
fixed front sprite shadow palette
2021-12-13 15:37:06 +01:00
ultima-soul
01a90ca6c2
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-27 22:17:05 -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
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
57bf1c7824
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-21 10:41:12 -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
e3b6337c3a
Finish battle_anim_mons doc
2021-11-08 14:29:37 -05:00
GriffinR
41ecae91f8
Label remaining symbols in graphics.c
2021-10-27 13:47:18 -04:00
GriffinR
b8a44bf10a
Calculate pokemon substruct size, missing MON_PIC_SIZE
2021-10-11 10:35:53 -04:00
GriffinR
d8e65fc4b6
More battle doc, add battle window ids
2021-10-09 03:01:10 -04:00
GriffinR
31b501e7eb
Start misc battle documentation
2021-10-08 16:39:46 -04:00
GriffinR
739e7d3c31
Document summary screen sprite manager
2021-10-02 23:47:59 -04:00
GriffinR
a66d7e1b43
Document some single-remaining symbols
2021-09-24 17:14:20 -04: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
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
3f75a58137
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-08-11 16:55:29 -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
PikalaxALT
810ca5f8ff
Flatten pos fields in struct Sprite
2021-07-07 09:11:52 -04:00
DizzyEggg
1e855cf469
Fix mon shadow when caught and learn new move
...
Fixes #1477
2021-06-09 09:49:42 +02: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
ultima-soul
cf19635a80
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-06-07 13:15:46 -07:00
ultima-soul
092f02f119
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-06-07 12:00:23 -07:00
ghoulslash
c3e28e9b1a
merge with be
2021-05-23 12:22:52 -06:00
Flametix
a8fab62c89
Fix Substitute typo
2021-05-06 20:49:04 -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
b8721034ef
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-04-02 13:42:05 -07:00
ultima-soul
939608f5b8
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-02 13:16:40 -07:00
GriffinR
62968895ca
Add MON_PIC_SIZE constant
2021-03-29 09:38:19 -04:00
ultima-soul
56a1cab314
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-03-23 15:21:19 -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
Evan
f3d975e239
merge with be
2021-02-12 08:59:55 -07: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
ultima-soul
2a20d50904
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-02-01 15:54:08 -08:00
ultima-soul
96232ea166
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-01-28 23:59:08 -08:00
GriffinR
a392cca928
Misc battle documentation
2021-01-23 00:40:31 -05:00
GriffinR
63a7828772
Document battle_controller_player.c
2021-01-22 20:03:27 -05:00
ultima-soul
3cb09b6507
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into deoxys_handling_removal
2021-01-11 15:19:11 -08:00
