ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,545 Commits 1 Branch 0 Tags 235 MiB
a5d661b512
Commit Graph

2679 Commits

Author SHA1 Message Date
ghoulslash
4b64433816
Add Battle Anim cmds for dynamic Task, Sprite creation + Misc. Anim Fixes (#2649) 
* add createvisualtaskontargets, createspriteontargets to fix electroweb, fiery wrath anims

* add missing semicolon

* add Cmd_createspriteontargets_onpos for heal block, fix heal block targeting

* remove duplicate func

* improve origin pulse anim

* fix IsDoubleBattle call

* venom drench acid uses average battler positions

* add GetSubpriorityForMoveAnim

* add GetBattleAnimMoveTargets for CreateSpriteOnTargets and Cmd_createvisualtaskontargets

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-02-19 11:48:12 +01:00
Martin Griffin
0573aa455a Introduce macros to parse battle script arguments 
CMD_ARGS for regular commands, VARIOUS_ARGS for various commands, and
NATIVE_ARGS for callnative commands.
 2023-02-17 10:05:57 +00:00
Eduardo Quezada
bd54990333 Review changes 2023-02-15 13:56:11 -03:00
ghoulslash
d508f12ac9 merge with upcoming 2023-02-13 08:38:32 -05:00
Eduardo Quezada
96865f66af Updated term to modernFatefulEncounter 2023-02-11 22:36:42 -03:00
Eduardo Quezada
6da5e0a280 Rename eventLegal to fatefulEncounter 2023-02-11 17:13:53 -03:00
GriffinR
de56e400ff Sync clone object macro 2023-02-08 13:11:10 -05:00
DizzyEggg
ff088752e7
Insomnia ability pop-up (#2643) 
* Insomnia ability pop-up

* remove B_MSG_STAYED_AWAKE_USING constant
 2023-02-07 18:47:23 +01:00
ghoulslash
843096d32a update setcharge macro 2023-02-02 22:46:24 -05:00
Martin Griffin
a13ffdbfba U-turn does not switch the user out if Emergency Exit activates 2023-01-27 00:57:22 +00:00
Eduardo Quezada D'Ottone
1bfc922c72
Merge pull request #2471 from ghoulslash/be/gen9items 
Start Gen9 Hold Effects
 2023-01-23 14:58:08 -03:00
ghoulslash
f97ec1975a merge w upcoming 2023-01-23 09:24:03 -05:00
LOuroboros
773e7f0de2 Fixed Explosion & Intimidate's 'interaction' 2023-01-17 22:16:42 -03: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
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
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
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
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
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