Eduardo Quezada
231727d02b
Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge
...
# Conflicts:
# asm/macros/event.inc
# data/specials.inc
# include/constants/species.h
# src/data/pokemon/base_stats.h
2022-07-22 23:33:04 -04:00
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
ghoulslash
2b5bb9f6e4
move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check
2022-07-19 18:24:53 -04:00
ghoulslash
6b84a9f0b3
merge w be
2022-07-17 12:40:43 -04:00
LOuroboros
52d6c96e69
Merge branch 'master' of https://github.com/pret/pokeemerald into pePretMerge
2022-05-13 03:20:42 -03:00
LOuroboros
2263caef7a
Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine
2022-05-13 03:17:31 -03:00
AgustinGDLV
54163240d8
implemented toggelable cancellation / multi-evo
2022-05-08 20:55:29 -07:00
AgustinGDLV
616e26121f
added new line
2022-05-05 12:02:34 -07:00
AgustinGDLV
7d42f93861
added special overworld evo changes
2022-05-05 11:55:31 -07:00
BuffelSaft
5358cc0a00
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2022-04-25 13:38:13 +12:00
GriffinR
fc5747f0f7
Merge pull request #1649 from GriffinRichards/clean-trainer
...
Trainer hill clean up
2022-04-20 00:20:44 -04:00
TheXaman
2fa812df26
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into rhh_master_merge
2022-04-13 20:51:35 +02:00
LOuroboros
446bcd3181
Merge branch 'master' of https://github.com/pret/pokeemerald into pePret
2022-04-11 01:23:18 -03:00
LOuroboros
b6e2945072
Merge branch 'master' of https://github.com/pret/pokeemerald into bePret
2022-04-11 01:22:10 -03:00
LOuroboros
fa39dc76dc
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
GriffinR
62f3f144ab
Clean up some trainer hill
2022-03-31 12:54:07 -04:00
LOuroboros
434f6cf5ad
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
2022-03-26 08:43:55 -03:00
ExpoSeed
f50a406b18
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2022-03-22 12:56:23 -05:00
GriffinR
bb91b1b0d1
Update generic macro argument names
2022-03-10 16:36:41 -05:00
ultima-soul
84a7f960c8
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2022-02-28 23:37:41 -08:00
ultima-soul
86089ce935
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2022-02-28 22:13:14 -08: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
GriffinR
dc7d86f026
Add new macro comments
2022-01-23 19:30:39 -05:00
GriffinR
2495d18132
Add missing :req, remove old macros
2022-01-23 18:52:04 -05:00
LOuroboros
8eaf0718ec
Review changes
...
Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.
2022-01-23 19:13:04 -03:00
LOuroboros
a8a8c7e2fa
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
2022-01-23 02:37:07 -03:00
GriffinR
3a6c633905
Add seteventmon
2022-01-11 02:16:25 -05:00
GriffinR
110fbc559c
Make item optional for givemon and setwildbattle
2022-01-11 02:08:14 -05:00
GriffinR
ce55e58ad8
Misc cleanup
2022-01-04 10:09:42 -05:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine
2021-12-23 15:29:10 -08: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
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
a5afdac0ae
Resolved review suggestions for upstream Battle Engine sync.
2021-12-08 12:08:16 -08:00
ultima-soul
7369f60c06
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
2021-12-03 17:30:45 -08:00
ultima-soul
a68a39e35f
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-12-01 20:17:49 -08:00
ultima-soul
23bf41713c
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-12-01 20:17:08 -08: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
d2eb5f0e61
Remove shell trap effect code
...
Left strings and animations as those were fine, but code was non-functional and fixing it was not trivial.
2021-11-22 14:46:47 +13:00
BuffelSaft
42b8f18cb1
Remove Corrosive Gas code
...
This was not working at all in testing, so it can be done by a separate PR later.
2021-11-22 14:35:01 +13:00
BuffelSaft
70f0018c08
Partially implement Shell Trap
...
Doesn't play the animation when the trap triggers, but kinda works? May also be incredibly buggy, but I'm not interested in working on this move any further.
2021-11-22 14:14:41 +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
W1serV1ser
c2f81cd5f5
Added Sky Drop
2021-11-20 11:44:48 -08:00
BuffelSaft
98712e576e
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2021-11-19 17:48:11 +13:00
GriffinR
42a83ee50e
Use STR_VAR names for apprentice_buff and frontier_gettrainername
2021-11-18 23:20:05 -05:00
GriffinR
c57efdba5d
Allow compare + goto_if/call_if as a single statement
2021-11-18 22:06:53 -05:00
GriffinR
591ab7241f
Macro comment typo fix, Object->object
2021-11-18 17:24:43 -05:00
GriffinR
c89dfd9f56
Finish updating macro comments
2021-11-18 01:47:58 -05:00
GriffinR
b5b5d95de6
Distinguish 'virtual object' names from object events
2021-11-17 23:40:53 -05:00
