atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16085 commits 2 branches 40 tags 617 MiB
Commit graph

2831 commits

Author SHA1 Message Date
sbird
a7cd4ca592 [script-command, dynmultichoice] implement event handler 2023-01-17 21:49:06 +01:00
sbird
276ce62d95 [script-command, dynmultichoice] add shouldSort, initialSelected arguments. read pushed arguments front to back 2023-01-17 21:49:06 +01:00
sbird
569fa0a60a [script-command] add dynmultichoice 
* supports variable length arguments
 * automatically scrolls
 * supports building list menus from a stack
 2023-01-17 21:49:06 +01:00
Ariel A
7b40e481ce Improved saving & loading expanded OWs. 2023-01-12 21:45:41 -05:00
Ariel A
72e723df65 Expanded graphicsId field. 2023-01-07 19:54:12 -05:00
LOuroboros
f1ca254c28 Updated the Mimicry reimplementation 
Mimicry is now a proud member of ABILITYEFFECT_ON_TERRAIN.

Misc. changes:
-Ditched the dependency on and usage of gBattlerAttacker for the effects inside ABILITYEFFECT_ON_WEATHER and ABILITYEFFECT_ON_TERRAIN.
-Made Cmd_switchineffects activate ABILITYEFFECT_ON_TERRAIN to take into account overworld weather-induced field terrains.
-Updated the text strings printed by the battle scripts inside the aforementioned AbilityBattleEffects caseIDs.
-Removed constant label of unused VARIOUS_TRY_TO_APPLY_MIMICRY which I forgot about.
-Updated ChangeTypeBasedOnTerrain, partly as a result of the aforementioned changes but also for optimization purposes.
 -There was never a reason to establish an empty scope, or to use GET_MOVE_TYPE and the variables that complemented it.
-Removed case ABILITY_QUARK_DRIVE from AbilityBattleEffects' case ABILITYEFFECT_ON_SWITCHIN.
 2023-01-03 02:27:41 -03:00
LOuroboros
d0f5653f5e Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry 2023-01-02 19:00:41 -03:00
LOuroboros
13d8c0d167 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2023-01-02 14:34:24 -03:00
LOuroboros
ca32d43433 Streamlined ability-on-weather changes 
Also renamed activateweatherabilities and activateterrainabilities.
 2023-01-02 14:32:56 -03:00
Eduardo Quezada D'Ottone
4dc72dcfc1
Merge pull request #1956 from SonikkuA-DatH/SonikkuA-DatH-Teatime2 
Implementing Teatime effect
 2022-12-30 17:49:54 -03:00
LOuroboros
e8dfb66c30 Adding ability effect triggers for terrains and weather 
A new, probably better way to handle the announcement trigger that abilities such as Protosynthesis and Quark Drive have, when the battle weather or the field terrain change.

Misc. changes:
-EFFECT_DAMAGE_SET_TERRAIN -> EFFECT_HIT_SET_REMOVE_TERRAIN
 -It's more appropriate as the effect can be used to force set a terrain or simply to remove an active terrain, after all.
 -The main reason for the rename was the inconsistency with the battle script's label.
-Reverted accidentally committed change to B_DOUBLE_WILD_CHANCE, performed back in c8abf00c.
 2022-12-30 03:25:16 -03:00
SphericalIce
200b71be02 Fix Beat Up's battle script to avoid an out-of-bounds array access 2022-12-27 10:49:57 +00:00
LOuroboros
d943f891c5 Applied Wind Power and Wind Rider correction 
-Renamed TryActivateWindRiderLoop to BattleScript_TryTailwindAbilitiesLoop
-Modified how it handles the check for Wind Rider by using a various and incorporated Wind Power into the mix because that ability is affected by Tailwind as well.
 2022-12-21 10:08:16 -03:00
LOuroboros
6153b8e904 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2022-12-20 07:11:36 -03:00
SonikkuA-DatH
f6fab92ac8
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2 2022-12-19 15:52:20 -08:00
SonikkuA-DatH
f0aee1f8d3
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2 2022-12-18 17:50:39 -08:00
LOuroboros
4c9446ed0a Fixed Speed Swap's effect 2022-12-14 12:00:45 -03:00
LOuroboros
a56cfd1aa7 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2022-12-12 19:55:48 -03:00
ghoulslash
340278c83b
Merge pull request #2452 from LOuroboros/intimidate 
Optimized Intimidate's code
 2022-12-11 22:04:16 -05:00
LOuroboros
0d1f9d9613 Reimplemented Mimicry 2022-12-09 20:46:18 -03:00
ghoulslash
6d28882e44 start gen9 hold effects 2022-12-06 09:48:36 -05:00
LOuroboros
ca656b63b9 Added Well Baked Body's effect and misc. changes 
-Added a modifybattlerstatstage macro to handle stat stages in battle.
-Rewrote the checks inside the case ABILITYEFFECT_MOVES_BLOCK of AbilityBattleEffects.
 2022-12-06 05:21:24 -03:00
ghoulslash
34ba9b4e0d convert a few various to callnatives 2022-11-28 14:36:19 -05:00
ghoulslash
510fb56d74 distinguish callnative vs. various macrso 2022-11-28 11:57:34 -05:00
ghoulslash
b869b836cc add callnative bs func, convert metal burst dmg calc 2022-11-28 10:34:27 -05:00
Ariel A
e6d1cfae24 Merge branch 'master' into followers 2022-11-21 21:21:50 -05:00
LOuroboros
31a602f3b6 Optimized Intimidate's code 2022-11-12 18:03:46 -03:00
Eduardo Quezada
f2d0e547ac Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030 
# Conflicts:
#	src/rom_header_gf.c
 2022-11-09 19:54:44 -03:00
Eduardo Quezada D'Ottone
e6ae0bd01e
Merge pull request #2434 from LOuroboros/badDreams 
Optimized Bad Dreams' code
 2022-11-08 08:16:07 -03:00
LOuroboros
f56df74576 Optimized Bad Dreams' code 
Misc:
-Made the ability pop up stick around until the ability's effect ends just like in ORAS.
-Updated sText_BadDreamsDmg accordingly while I was at it.
 2022-11-04 14:58:58 -03:00
ghoulslash
1e6903840a Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into be/bugbite 2022-11-04 09:29:45 -04:00
ghoulslash
d13431b4ab merge w rhh master 2022-11-04 09:29:39 -04:00
Eduardo Quezada
e4a439aa46 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 
# Conflicts:
#	src/data/bard_music/moves.h
#	src/data/bard_music/pokemon.h
 2022-10-30 12:30:38 -03:00
BuffelSaft
6035c5a280 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-10-22 14:31:13 +13:00
GriffinR
a418f8d976
Merge pull request #1755 from GriffinRichards/map-dynamic 
Rename special map constants, treat warp ids as strings
 2022-10-18 22:45:56 -04:00
Ariel A
1c011a9c1c Merge branch 'master' into followers 2022-10-07 20:52:15 -04:00
Eduardo Quezada D'Ottone
17c8842ad4
Merge branch 'dev' into teleport 2022-09-24 14:39:21 -03:00
Eduardo Quezada D'Ottone
a483899043
Merge branch 'dev' into symbiosis 2022-09-24 11:58:35 -03:00
Eduardo Quezada
de32940fdf Further removed trailing whitespaces 2022-09-13 16:26:36 -03:00
Eduardo Quezada
1d7e8bd730 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 
# Conflicts:
#	asm/macros/battle_ai_script.inc
#	asm/macros/battle_script.inc
#	data/battle_ai_scripts.s
#	include/link_rfu.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c
#	src/sound.c
 2022-09-13 16:22:42 -03:00
Eduardo Quezada
65108c3192 Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
Eduardo Quezada D'Ottone
47a50b3dac
Merge branch 'master' into weather_forms_fixes 2022-09-07 23:07:25 -04:00
LOuroboros
8705d1656b Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into teleport 2022-09-06 20:38:28 -03:00
Ariel A
8c60050553 Added proper movement actions for exiting/entering pokeball. 2022-08-28 23:34:39 -04:00
GriffinR
ce4a6e9067 MAP_NONE -> MAP_DYNAMIC 2022-08-25 21:34:05 -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
898ec580ae
Merge pull request #1737 from GriffinRichards/lock-unlock 
Clean up lock/unlock anim movement
 2022-08-22 01:30:33 -04:00
tustin2121
1cb659df8c Renaming Script Contexts 
- Determined how the various script contexts were used and renamed accordingly.
- ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts.
- ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames.
- ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.
 2022-08-15 15:18:12 -04:00
GriffinR
5515e328b2 Clean up lock/unlock anim movement 2022-08-12 21:18:10 -04:00
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
Ariel A
9beee311c4 Merge branch 'master' into romhack 2022-07-17 15:13:15 -04:00
ghoulslash
6b84a9f0b3 merge w be 2022-07-17 12:40:43 -04:00
GriffinR
e6a374f2b6 Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall 2022-07-06 14:49:08 -04:00
LOuroboros
8f728dcd79 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport 2022-07-03 13:49:18 -03:00
Sneed69
d0a2be9630 weather forms fixes and config 2022-05-22 03:20:48 +03:00
ghoulslash
cdd37ad1bb fix stuff cheeks w new consumeberry impl 2022-05-13 16:28:23 -04:00
ghoulslash
f6f4227f49 better bug bite impl, fix item removal 2022-05-13 16:21:41 -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
542a0f07b4 fixed bug bite / bestow 2022-05-06 22:07:25 -07:00
BuffelSaft
3e1934ebe3 Rework VARIOUS_IS_PARENTAL_BOND_LAST_STRIKE 
Make this more versatile by allowing it to check parentalBondOn instead of only checking if parentalBondOn == 2. Also, fix Dragon Tail/Circle Throw switching the target on the first hit.
 2022-05-07 14:20:37 +12:00
BuffelSaft
8693db632b Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-05-07 12:27:20 +12:00
LOuroboros
43053d2e6c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport 2022-05-06 02:22:14 -03: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
Ariel A
bdcbb5c700 Merge branch 'master' into romhack 2021-12-18 17:14:52 -05: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
LOuroboros
f317b542e2 Updated Teleport 2021-12-11 21:20:04 -03: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
SonikkuA-DatH
1de476da84
Update battle_script.inc 2021-11-28 19:33:58 -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
BuffelSaft
16a4fc9062 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2021-11-19 16:33:24 +13: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
GriffinR
b9fa18bdd4 Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros 2021-11-17 22:03:37 -05:00
GriffinR
c4f8f4d11a Add STR_VAR_# ids to string buffer macros 2021-11-17 22:00:44 -05:00
GriffinR
c940b67716 Continue macro comment updating 2021-11-17 17:45:59 -05:00
GriffinR
c1970a4bc8 Remove dead sub references 2021-11-17 15:47:47 -05:00
GriffinR
eb95ac0b9c Document field_tasks 2021-11-17 14:44:42 -05:00
cbt6
9d18ad0b5a Make arguments for create_movement_action required 2021-11-18 03:07:09 +08:00
cbt6
f23d9ff30e Use movement action constant values over enum 2021-11-18 02:43:39 +08:00
GriffinR
61aa9c3ba9 More updating event macro comments 2021-11-16 17:46:34 -05:00
GriffinR
5d9c31a610 Label slot machine ids, fix GetPriceReduction 2021-11-16 15:43:52 -05:00
GriffinR
63c5905914 Continue updating event macro comments 2021-11-16 13:10:23 -05:00
GriffinR
04cc923d6c Handle optional arguments for warp commands, add WARP_ID_NONE 2021-11-16 10:53:00 -05:00
LOuroboros
5c485d9769 Fixed Fling when gLastUsedItem is 0 
Also renamed VARIOUS_JUMP_IF_NO_FLING_POWER to VARIOUS_JUMP_IF_FLING_FAILS.
 2021-11-15 14:02:33 -03:00
GriffinR
f85de6eca5 Start event macro comment updates 2021-11-15 10:54:57 -05:00
LOuroboros
a01fd2eb7a Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2021-11-15 12:47:26 -03:00
LOuroboros
cbb6639f8d Fling tweaks 
-Updated and renamed VARIOUS_JUMP_IF_FLING_FAILS (now VARIOUS_JUMP_IF_NO_FLING_POWER)
-Updated BattleScript_EffectFling following Smogon's description of Fling's effect.
-Refactored BattleScript_FlingMentalHerb thanks to GetMentalHerbEffect
-No need to define flingPower when its value is 0
-Forced the target to eat a berry that was flung at them by overwriting their item with the berry thrown and restoring their original item after its effect finishes.
-Added a preproc config for Klutz.
 2021-11-15 12:40:10 -03:00
GriffinR
b14fe9dce3
Merge pull request #1547 from GriffinRichards/doc-sounddata 
Clean up sound, add CRY_MODE constants
 2021-11-13 15:54:40 -05:00
ghoulslash
940a165be7 merge w be 2021-11-13 09:09:15 -05:00
LOuroboros
2fe015e5ce Implemented Fling 2021-11-13 10:27:05 -03:00
BuffelSaft
04867ac0d3 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2021-11-13 17:33:25 +13:00
BuffelSaft
55b279ba0a Fix several move effects 
Dragon Tail, Natural Gift, Spit Up all hit twice now. Could maybe use isparentalbondlaststrike instead of some of the other checks too.
 2021-11-13 16:29:12 +13:00
GriffinR
ef935f6f4a
Merge pull request #1544 from GriffinRichards/romheadergf 
Split headers from crt0.s
 2021-11-09 23:54:57 -05:00
BuffelSaft
e2599c2469 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1 2021-11-10 14:31:32 +13:00
GriffinR
54b254a829 Add CRY_MODE constants 2021-11-07 13:33:05 -05:00
ghoulslash
41bf1dc2f4 merge w be 2021-11-06 10:40:57 -04:00
LOuroboros
5f458c9cd3 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser 2021-11-05 10:58:53 -03:00
BuffelSaft
ee83d1142c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1 2021-11-05 21:40:05 +13:00
cbt6
32aaf6912f Rename movement scripts to use Faster over Fastest 2021-11-05 02:22:28 +08:00
LOuroboros
4f251e6ec2 Moved VARIOUS_TRY_TO_REVERT_MIMICRY to VARIOUS_REMOVE_TERRAIN 2021-11-04 12:13:55 -03:00
BuffelSaft
cecd341011 Fix Tar Shot 
If Tar Shot can't do anything to the target it should fail. Checking this is clunky, but it works.
 2021-11-04 20:47:45 +13:00
BuffelSaft
3baf2aa331 Remove trynextdart, update waitmessage 0x40 
Not dealing with Dragon Darts in this PR. Updated waitmessage 0x40 to waitmessage B_WAIT_TIME_LONG.
 2021-11-04 20:19:18 +13:00
BuffelSaft
28e78cb6c4 Gen 8 moves initial commit 
Full credit to Nunuchu42 and cfmnephrite for this code.
 2021-11-04 19:50:54 +13:00
LOuroboros
b931e34172 Handled Mimicry's interaction with Steel Roller's effect 2021-11-03 23:23:28 -03:00
LOuroboros
f6628e301f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry 2021-11-03 20:43:33 -03:00
ghoulslash
48c29a9cd8 proper mirror armor sticky web targeting 2021-11-03 15:05:52 -04:00
LOuroboros
af6e72ecfe Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser 2021-11-03 08:56:01 -03:00
LOuroboros
69b42de0d9 Implemented Mimicry 
Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
 2021-11-02 14:44:55 -03:00
ghoulslash
ffcba355b0 merge w be 2021-11-02 10:36:08 -04:00
ghoulslash
98b4b821dc merge with be 2021-11-01 13:55:55 -04:00
ghoulslash
a1e64fce4f handle simple beam, gastro acid 2021-11-01 13:50:57 -04:00
ghoulslash
b5d20da927 merge with be 2021-11-01 11:36:18 -04:00
GriffinR
dac4192fd3 Split headers from crt0 2021-10-31 16:39:54 -04:00
GriffinR
13cd2a41f0 Better braille support 2021-10-30 16:19:10 -04:00
ghoulslash
468ee66cd8 fix synthesis and leaf guard w utility umbrella 2021-10-30 11:04:50 -04:00
ghoulslash
af914ee7ed merge w be 2021-10-29 22:33:50 -04:00
ghoulslash
f342e7c590 merge with be 2021-10-28 17:03:10 -04:00
LOuroboros
a77f058146 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser 2021-10-28 14:24:43 -03:00
LOuroboros
82101d3581 Optimizations 2021-10-28 14:02:43 -03:00
LOuroboros
28522f3ffb Fixed Hyperspace Fury not breaking through protections 
Also repositioned VARIOUS_JUMP_IF_SPECIES.
 2021-10-28 12:09:44 -03:00
ghoulslash
bebaded415 merge with be 2021-10-27 16:48:38 -04:00
LOuroboros
8c35a68060 Quick syntax tweaks 2021-10-27 11:19:39 -03:00
LOuroboros
fc7f1acf20 Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser 2021-10-27 11:13:59 -03:00
LOuroboros
1ab8c84f41 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury 2021-10-26 21:23:21 -03:00
Eduardo Quezada D'Ottone
76b6250104
Merge branch 'battle_engine' into plasmaFists 2021-10-23 11:06:34 -03:00
LOuroboros
a6315ffc75 Implemented Plasma Fists 2021-10-19 09:50:18 -03:00
LOuroboros
d9b8e11a9c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE 2021-10-19 07:47:42 -03:00
LOuroboros
dcea8e45ed Fixed jumpifspecies 2021-10-17 10:51:55 -03:00
Eduardo Quezada D'Ottone
21837b659a
Merge branch 'battle_engine' into bug_bite 2021-10-14 19:46:50 -03:00
BuffelSaft
fc6e8f598c Merge branch 'battle_engine' into battle_bond 2021-10-14 16:24:59 +13:00
BuffelSaft
bb8d0e3d6b Fix Battle Bond 
Battle Bond Greninja transforms only after a KO, and doesn't revert when switched out.
 2021-10-14 16:18:11 +13:00
ghoulslash
a3d2bdc9cf merge with be 2021-10-13 18:30:53 -04:00
GriffinR
def6cc8158 Label battle script macro arguments 2021-10-13 17:44:04 -04:00
GriffinR
fc15b0d5f0 Add controller buffer constants, finish misc battle doc 2021-10-13 16:21:39 -04:00
ghoulslash
996301d5d3 add mirror armor 2021-10-12 18:04:34 -04:00
ghoulslash
25a4da71fe remove unused macro 2021-10-12 10:37:59 -04:00
ghoulslash
bbd09fdcf7 add wandering spirit 2021-10-12 10:32:51 -04:00
GriffinR
f23e0beeba Rename battle anim cmds, move its data, name remaining symbols 2021-10-11 13:18:21 -04:00
ghoulslash
06bcfea3b8 merge with be 2021-10-10 19:56:33 -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
ghoulslash
4aeadd96c9 merge with be 2021-10-06 14:49:23 -04:00
ghoulslash
391cfabcac merge with be 2021-10-06 14:31:21 -04:00
ghoulslash
4382420dd2 merge with be 2021-10-06 13:32:59 -04:00
LOuroboros
b85b3094c8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalAbilitiesDev 2021-10-03 07:05:56 -03:00
LOuroboros
a506bf03c6 Corrected Flower Veil check 2021-10-01 02:14:46 -03:00
ghoulslash
761006a164 merge with be 2021-09-26 19:19:32 -04:00
GriffinR
a66d7e1b43 Document some single-remaining symbols 2021-09-24 17:14:20 -04:00
ultima-soul
fe6a11e5ec
Update asm/macros/battle_script.inc 2021-09-23 12:26:36 -07:00
ghoulslash
767e25bfed
Update asm/macros/battle_script.inc 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-09-23 13:19:12 -06:00
ghoulslash
2f69748e0d merge with be 2021-09-23 14:38:01 -04:00
ghoulslash
94ec25319f syntax fixes. Use BlocksPrankster for perish song battle script 2021-09-23 14:35:37 -04:00
ghoulslash
13062b5a8f fix lash out, obstruct, and decorate 2021-09-22 09:43:40 -04:00
ghoulslash
0ea6c65b83 merge with be 2021-09-17 09:10:09 -04:00
ghoulslash
b916d7991c merge with be 2021-09-16 21:52:29 -04:00
ghoulslash
af8d86f0c9 merge with be 2021-09-16 13:33:35 -04:00
ghoulslash
9d8672e3df merge with be 2021-09-16 13:12:59 -04:00
ghoulslash
9c94eb6140 but it failed check for rototiller 2021-09-16 10:24:32 -04:00
ghoulslash
aa475ab300 merge with be 2021-09-15 16:42:23 -04:00
ghoulslash
60713a8f2d fix room service activation msg, stat target 2021-09-14 12:50:36 -04:00
ExpoSeed
5a5c257f68 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-09-02 21:43:20 -05:00
ghoulslash
7c53214dad merge with be 2021-09-02 15:33:42 -04:00
ultima-soul
a10a02a536
Merge pull request #1221 from ghoulslash/battle_engine 
Implement Pickpocket
 2021-09-02 11:33:34 -07:00
Ariel Antonitis
8a3b04e837 Merge branch 'master' into romhack 2021-09-02 01:03:13 -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
9e4f33d09e Implemented Desolate Land, Primordial Sea and Delta Stream 2021-08-27 17:56:43 -03: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
ghoulslash
c7c0fbc296 merge with be, make AI CanBeStatused functions separate from general util ones 2021-08-12 13:37:53 -06:00
ghoulslash
d218322b2c merge with be 2021-08-12 01:26:13 -04: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
ghoulslash
4ca6d76160 add bug bite 2021-07-25 14:55:52 -06:00
ghoulslash
c914ed8572 fix sucker punch, surging strikes, obstruct, and snipe shot 2021-07-25 09:38:54 -06:00
ghoulslash
a37d4c3da9 merge with be, give life dew jungle healing effect 2021-07-25 08:22:05 -06:00
GriffinR
b4f66496ed
Merge pull request #1471 from GriffinRichards/fix-lock 
Fix some object lock names
 2021-07-03 11:21:10 -04:00
Xhyzi
c2bd046ea6 Shell Trap 2021-06-15 20:22:50 +02:00
Xhyzi
155e9b6332 Court Change 2021-06-15 20:14:10 +02:00
Xhyzi
0202b75822 Beak Blast 2021-06-15 19:57:21 +02:00
Xhyzi
7799e49e3a Corrosive Gas 2021-06-15 19:45:24 +02:00
ExpoSeed
c8fc141287 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-06-10 11:54:20 -05: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
MissingNoL
bfc66a21cc gBattlescriptCurrInstr[3] is not reading species parameter 2021-06-06 19:14:11 -07:00
Ariel Antonitis
e4b9bb75e2 Merge branch 'master' into romhack 2021-06-04 23:36:21 -04:00
MissingNoL
f30a9542ee Problem: Photon Geyser is calculating as Shell Side Arm?? Needs: Poison effect, contact move for Shell Side Arm 2021-05-27 22:21:55 -07:00
ghoulslash
c356ffaed4 merge with be. fix null ptr check in GetBattleMoveSplit 2021-05-24 10:46:53 -06:00
ghoulslash
5840b1f0ed utility umbrella effect 2021-05-24 09:52:45 -06:00
ExpoSeed
6a977bdbfc Document second parameter of playbgm 2021-05-21 15:08:00 -05:00
Ariel Antonitis
3201422bbb Merge branch 'master' into romhack 2021-05-04 22:14:50 -04:00
GriffinR
4206359862 Fix some object lock names 2021-05-04 01:21:50 -04:00
ultima-soul
cf0fd961b9 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-28 23:56:58 -07:00
ultima-soul
56fc420187 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-28 21:34:30 -07:00
ultima-soul
0da3f74a7e Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-28 18:58:38 -07: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
dbe24f0baa Clean up contest_painting 2021-04-21 20:04:12 -04:00
Ariel Antonitis
221569a710 Merge branch 'master' into romhack 2021-04-18 22:17:53 -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
GriffinR
f4d8a91ba4 Misc battle script cleanup 2021-04-03 14:07:31 -04: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
21fd6827b0
Merge pull request #1394 from GriffinRichards/fix-bgevent 
Fix bg event macros
 2021-04-01 14:22:48 -04:00
GriffinR
038505984c Fix bg event macros 2021-04-01 02:42:02 -04:00
GriffinR
f602a9dcbf Use bool for multichoice ignoreBPress 2021-03-31 00:35:56 -04:00
GriffinR
7a5c6d4d86 Standardize Friendship/Happiness 2021-03-27 17:27:20 -05: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
Ariel Antonitis
8a3dfbf252 Added pokemon followers & script commands. 2021-03-03 01:04:22 -05:00