ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-29 13:50:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,516 Commits 1 Branch 0 Tags 235 MiB
6cb483bc9b
Commit Graph

3936 Commits

Author SHA1 Message Date
ultima-soul
0312c5be8b Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-27 21:38:26 -08:00
ghoulslash
e2af9ec3b4 ice type immunity to sheer cold 2021-11-26 11:49:49 -05:00
ghoulslash
5c52abd856 gen3 sport move functionality behind config 2021-11-23 21:20:32 -05:00
ghoulslash
e3ddad2d11 add sport effects back 2021-11-23 18:36:10 -05: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
kleeenexfeu
9b25e0147c
Update include/constants/battle_config.h 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-11-23 14:35:37 +01:00
kleeenexfeu
f2755ad970
reword B_RECALC_TURN_AFTER_ACTIONS explanation 2021-11-23 14:28:52 +01:00
kleeenexfeu
84e6e083f7
hate the explanations about turn order ._. 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-11-23 14:24:30 +01:00
kleeenexfeu
6ceffaaf3e recalculate turn order after relevant actions 2021-11-23 13:46:36 +01:00
kleeenexfeu
1a5d3191e2 battle_engine merge 2021-11-23 13:38:36 +01:00
BuffelSaft
a89ce0c38a Swapped webs don't trigger Defiant 
Track the side that originally set Sticky Web, and if it matches the side the target of the speed drop is on, don't activate Defiant. Hard to tell if this is a bug or a feature in gen 8 - maybe the swapped webs are considered a "friendly" effect?

Also, fix Sticky Web not activating Defiant.
 2021-11-23 22:54:30 +13:00
BuffelSaft
499fb8071d Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2021-11-23 17:12:24 +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
BuffelSaft
6b8f86c276 Snap Trap placeholder anims 
Set up animation data for Snap Trap so it can be easily replaced with a proper animation later.
 2021-11-23 11:05:36 +13:00
BuffelSaft
ff60882b29 Requested changes 2021-11-23 11:04:39 +13:00
BuffelSaft
62f01e89d7 Fix Burmy form change 
Wasn't properly tracking if Burmy had appeared in battle; gSentPokesToOpponent is used only for exp calculation and is cleared when an opponent faints, so a new var was needed.
 2021-11-23 00:46:43 +13:00
BuffelSaft
50d0cd52e8 Clean up Corrosive Gas 
Remove code and unused move effect.
 2021-11-22 15:13:54 +13: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
3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
Eduardo Quezada D'Ottone
dee7f97a8d
Merge branch 'battle_engine' into battle_ai 2021-11-21 14:46:09 -03:00
Eduardo Quezada D'Ottone
30a4ef3723
Merge pull request #1924 from ghoulslash/be/wish 
Fix wish
 2021-11-21 14:04:06 -03:00
ghoulslash
3404039330
Merge pull request #1918 from kleeenexfeu/be_mega_evo_alter_turn 
Mega Evolution alters turn order
 2021-11-21 08:12:21 -05:00
BuffelSaft
bcaa17ffb3 Finish/tidy up Court Change 
Use a macro to simplify timer and status updates, and swap things like reflectBattlerId to the opposing side - this is required for the effects to be properly swapped.
 2021-11-21 17:20:45 +13:00
ghoulslash
3fb62f74c6 fix rampage cancelling 2021-11-20 18:35:56 -05:00
ghoulslash
37ab20e29c fix wish 2021-11-20 16:49:04 -05:00
W1serV1ser
c2f81cd5f5 Added Sky Drop 2021-11-20 11:44:48 -08:00
kleeenexfeu
6402a7ab6e
follow suggestion 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-11-19 23:42:20 +01:00
kleeenexfeu
acddeeb1f9
follow suggestion 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-11-19 23:30:33 +01:00
kleeenexfeu
03a9f3f413 Mega Evolution alters turn order 2021-11-19 22:03:10 +01:00
Eduardo Quezada D'Ottone
1696e60b9f
Merge pull request #1876 from ghoulslash/be/ai_updates 
Some more CanAIFaintTarget checks and other AI updates
 2021-11-19 17:33:21 -03:00
BuffelSaft
14a2e86313 Fix Scale Shot 
Lowers defense and raises speed instead of just lowering defense now. Tested with Contrary and min/max speed/def.
 2021-11-19 21:57:32 +13: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
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
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
ecb13cdbf7
Merge pull request #1550 from GriffinRichards/doc-pokenav 
Document Pokénav
 2021-11-17 14:47:34 -05:00
GriffinR
eb95ac0b9c Document field_tasks 2021-11-17 14:44:42 -05:00
GriffinR
61aa9c3ba9 More updating event macro comments 2021-11-16 17:46:34 -05:00
GriffinR
d414787932 Some TV clean-up 2021-11-16 16:22:17 -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
Eduardo Quezada D'Ottone
cc833ebb59 Created macro + config for always critting when using high-crit moves 2021-11-15 23:21:46 -03:00
Eduardo Quezada D'Ottone
a1bd6bd52f Updated species that benefit from Leek 2021-11-15 22:30:20 -03: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
c1130592fa Drop some overworld prefixes 2021-11-15 10:58:05 -05:00
GriffinR
65d3b58374 Add PARTY_NOTHING_CHOSEN 2021-11-15 10:57:06 -05:00
LOuroboros
de74177966 Oops 2021-11-15 12:52:05 -03: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
ghoulslash
2a1299715f merge w be 2021-11-15 10:45:59 -05: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
ghoulslash
0e397c43fe
Merge pull request #1898 from AsparagusEduardo/BE_postIETweaks 
Adjusted elements to simplify the conflicts between BE and IE
 2021-11-15 08:27:28 -05:00
GriffinR
4275cf4b90 Rename pokenav match call files 2021-11-15 01:30:21 -05:00
GriffinR
14d78d7633 Finish match call menu doc 2021-11-15 01:20:03 -05:00
GriffinR
c779d03b3e Rename pokenav_match_call_ui 2021-11-15 00:21:40 -05:00
GriffinR
d4d4234283 Finish pokenav list ui doc 2021-11-15 00:09:02 -05:00
Wiz
927f9d27df Designate gBattleAnimBgImage_Attract and related as arrays 2021-11-14 17:08:03 -05:00
ghoulslash
8b296b97a8
Merge pull request #1887 from BuffelSaft/knock-off 
Fix Knock Off, add config
 2021-11-14 08:27:51 -05:00
GriffinR
f42eafc85b
Merge branch 'master' into doc-banim 2021-11-13 23:26:46 -05:00
GriffinR
159bb37bbe
Merge branch 'master' into fix_saveblock_reorder 2021-11-13 23:19:57 -05:00
GriffinR
9a932cd9c3
Merge pull request #1549 from GriffinRichards/doc-binterface 
Document remaining symbols in battle_interface, palette, and save
 2021-11-13 23:19:08 -05:00
ProjectRevoTPP
9d3345a6d6 Enforce structs to enforce save block order for modern toolchains. 2021-11-13 21:41:16 -05: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
GriffinR
b3e593dff5 Continue pokenav list ui doc 2021-11-13 15:52:58 -05:00
GriffinR
ec05157568 Move pokenav list item union out of list struct 2021-11-13 11:27:11 -05:00
Eduardo Quezada D'Ottone
bcbdb353f5 Adjusted elements to simplify the conflicts between BE and IE 2021-11-13 12:10:20 -03:00
ghoulslash
940a165be7 merge w be 2021-11-13 09:09:15 -05:00
Eduardo Quezada D'Ottone
8f52996144
Merge pull request #1892 from ghoulslash/be/wish 
wish update
 2021-11-13 11:01:04 -03:00
ghoulslash
9df66f4ac1
Merge pull request #1843 from Blackforest92/battle_engine 
Update Giga Impact's graphic and use fade-in battle animation.
 2021-11-13 08:54:37 -05:00
ghoulslash
a4204e5491
Update include/constants/battle_config.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-11-13 08:50:24 -05:00
LOuroboros
2fe015e5ce Implemented Fling 2021-11-13 10:27:05 -03:00
Eduardo Quezada D'Ottone
bcb0f1b915
Merge pull request #1890 from kleeenexfeu/battle_engine 
Bypassing screens and protections correctly
 2021-11-13 10:11:02 -03:00
kleeenexfeu
f808710932
Moving IsBattlerProtected 2021-11-13 13:38:07 +01:00
GriffinR
3b91d8fdaf Start pokenav list ui doc 2021-11-12 20:36:19 -05:00
GriffinR
da5752fd0d Start match call menu doc 2021-11-12 20:17:06 -05:00
ghoulslash
c4efe06f38 wish update 2021-11-12 17:55:05 -05:00
Eduardo Quezada D'Ottone
a7870dbef0
Merge branch 'battle_engine' into magician 2021-11-12 19:40:34 -03:00
GriffinR
ffe2970e30 Rename pokenav menu handler files 2021-11-12 17:13:50 -05:00
GriffinR
baeacbe2f1 Clean up pokenav general menus, organize pokenav graphics 2021-11-12 17:08:12 -05:00
ghoulslash
96fd8e696b brick break gen 4 and 5 config. clears aurora veil 2021-11-12 15:00:21 -05:00
ultima-soul
294fecd57c
Merge pull request #1888 from ghoulslash/be/contrary 
Fix Contrary Animation
 2021-11-12 10:19:37 -08:00
ghoulslash
a26da51e9d fix contrary animations for MOVE_EFFECT_statchange 2021-11-12 12:44:45 -05:00
ultima-soul
c5dabf34b8
Improve Serene Grace boost config comment. 2021-11-12 09:39:18 -08:00
GriffinR
004d1cab3f Clean up pokenav conditions doc 2021-11-12 11:13:49 -05:00
GriffinR
35aeff1b6d Rename pokenav conditions files 2021-11-12 11:07:52 -05:00
GriffinR
f5152094a9 Finish pokenav conditions doc 2021-11-12 11:01:22 -05:00
ghoulslash
201a38f487 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be/ai_updates 2021-11-12 08:13:21 -05:00
ghoulslash
6214d8b625 rename config 2021-11-12 07:47:24 -05:00
BuffelSaft
bdbdd0564f Fix Knock Off, add config 
Added a config for Knock Off's damage boost. Also fixed the conditions it checks to do bonus damage.
 2021-11-12 21:05:42 +13:00
ghoulslash
adc1413d98 add kings rock serene grace boost config 2021-11-11 17:48:15 -05:00
ghoulslash
2fac38cc83 merge w be 2021-11-11 16:16:26 -05:00
GriffinR
7efdc0902b Finish condition graph doc 2021-11-11 15:29:15 -05:00
ultima-soul
fd4d0db912 Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into ball_effects 2021-11-10 18:02:00 -08:00
GriffinR
4590887359 Clean up some register constant use 2021-11-10 17:01:21 -05:00
GriffinR
343ac99049 Start pokenav conditions doc 2021-11-10 17:00:54 -05:00
GriffinR
342b7da5d3 Fix CRY_MODE_ECHO 2021-11-10 11:59:15 -05: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
8e424b6985
Merge branch 'master' into doc-binterface 2021-11-09 16:09:48 -05:00
GriffinR
43e942c3af Clean up pokenav ribbons 2021-11-09 12:50:35 -05:00
ghoulslash
e635930a15 fixes 2021-11-08 21:33:00 -05:00
GriffinR
1c82571fa0
Merge pull request #1542 from GriffinRichards/doc-menu 
Document menu
 2021-11-08 21:23:21 -05:00
GriffinR
adf773f1ed Document remainder of save.c 2021-11-08 19:45:14 -05:00
GriffinR
ab1074e629 Label unknown palette functions 2021-11-08 16:08:36 -05:00
GriffinR
684f599a44 Label remaining battle_interface symbols 2021-11-08 16:03:44 -05:00
GriffinR
e3b6337c3a Finish battle_anim_mons doc 2021-11-08 14:29:37 -05:00
ghoulslash
01cf8e6452 add AI_MoveMakesContact, dissuade multi-hit attacks against rocky helmet 2021-11-08 11:55:06 -05:00
GriffinR
d20341646a Start battle_anim_mons doc 2021-11-08 11:46:13 -05:00
ghoulslash
8f320a8d33 some ai updates, recycle + ripen logic 2021-11-08 11:37:41 -05:00
GriffinR
1548e902cd Add MonCoods size macro 2021-11-08 09:41:23 -05:00
Blackforest92
76ba9d835a pulled latest RHH battle_engine 08-11-2021 2021-11-08 16:38:42 +07:00
BuffelSaft
d3a845d511 Fix CanAIFaintTarget 
Rename CanAIFaintTarget to CanIndexMoveFaintTarget and create a new function, CanAIFaintTarget, that checks if any known move can KO the target.
 2021-11-08 20:37:28 +13:00
ghoulslash
a90cf4a501
Merge pull request #1724 from AsparagusEduardo/BE_TerrainMoves 
Moves affected by Terrain: Camouflage, Secret Power & Terrain Pulse
 2021-11-07 17:39:03 -05:00
GriffinR
c4169cfd29 Disambiguate cry functions 2021-11-07 14:26:09 -05:00
GriffinR
54b254a829 Add CRY_MODE constants 2021-11-07 13:33:05 -05:00
Eduardo Quezada D'Ottone
4e6a459b14 Optimized terrain timers 2021-11-06 19:46:52 -03:00
Eduardo Quezada D'Ottone
8773e552ac Organized config and added failsafe to AnimTask_SetCamouflageBlend 2021-11-06 19:24:06 -03:00
Eduardo Quezada D'Ottone
1c4a0c205a Camouflage types config + extra terrains 2021-11-06 19:09:35 -03:00
Eduardo Quezada D'Ottone
b220da1d2a Updated NaturePowerMoves table for new terrains + added failsafe in case the terrain isn't defined in the table 2021-11-06 18:50:01 -03:00
Eduardo Quezada D'Ottone
e9804a5023 Secret Power animation config 2021-11-06 17:32:34 -03:00
Eduardo Quezada D'Ottone
328976bf81 Secret Power effect config 2021-11-06 17:05:13 -03:00
ghoulslash
da6ec51fc2 merge w be 2021-11-06 10:43:35 -04:00
ghoulslash
41bf1dc2f4 merge w be 2021-11-06 10:40:57 -04:00
ghoulslash
f7d11527aa
Merge pull request #1867 from AsparagusEduardo/BE_synchroToxic 
Config for Synchronize's interaction with toxic poisoning
 2021-11-06 10:36:50 -04:00
Eduardo Quezada D'Ottone
ae8de0f07a Merge branch 'BattleEngine' into BE_TerrainMoves 
# Conflicts:
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
#	src/battle_util.c
 2021-11-06 10:44:05 -03:00
BuffelSaft
5acebe32aa
Merge pull request #1817 from LOuroboros/photonGeyser 
Implemented Photon Geyser and Shell Side Arm
 2021-11-06 16:04:53 +13:00
Eduardo Quezada D'Ottone
202827068c
a 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-11-05 21:25:42 -03:00
Eduardo Quezada D'Ottone
8e49e3e653 Config for Synchronize's interaction with toxic poisoning 2021-11-05 21:16:13 -03:00
BuffelSaft
4007a8d1f8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into relic_song 2021-11-06 11:52:51 +13:00
Eduardo Quezada D'Ottone
6c70a6b872
Merge pull request #1863 from LOuroboros/soulDewBE 
Added a battle config for the Soul Dew
 2021-11-05 17:09:44 -03: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
ghoulslash
0b2542e447 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into smart_wild_ai 2021-11-05 09:46:12 -04:00
LOuroboros
d15eeeb8eb Fixed the comment for B_SOUL_DEW_BOOST 2021-11-05 10:37:41 -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
BuffelSaft
bf786c6c9a Fix Magma Storm 
Fix the strings and animation displayed when Magma Storm. Also move gTrappingMoves to battle_script_message.c as it's only sued in this file, and this allows ARRAY_COUNT(sTrappingMoves) to replace the constant in SetMoveEffect.
 2021-11-05 18:22:52 +13:00
BuffelSaft
a8d44f84a1
Merge pull request #1852 from Blackforest92/battle_engine_2 
Update waterfall, trick room, & focus blast BG
 2021-11-05 15:27:52 +13:00
BuffelSaft
6df3975fc6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2 2021-11-05 14:32:33 +13:00
Eduardo Quezada D'Ottone
5eb8f1c158
Merge pull request #1855 from ghoulslash/be/abilityonside 
AI versions of CanPoisonType, CanBePoisoned and IsAbilityOnSide
 2021-11-04 21:49:31 -03:00
GriffinR
e65677c944 Update modern linker script 2021-11-04 17:28:41 -04:00
LOuroboros
671cbabc3d Added a battle config for the Soul Dew 2021-11-04 17:25:31 -03:00
cbt6
0fe3881961 Rename WalkInPlaceFastest to WalkInPlaceFaster 2021-11-05 01:54:34 +08:00
ghoulslash
0ac6860855
Merge pull request #1810 from BuffelSaft/ai_improvements 
AI: Multi-strike moves, variable power moves, sleep check
 2021-11-04 12:28:00 -04:00
GriffinR
be7d0bd3b0
Merge branch 'master' into doc-menu 2021-11-04 12:11:31 -04:00
GriffinR
17b657d83a Finish menu documentation 2021-11-04 11:52:43 -04:00
LOuroboros
22f7e81bef Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry 2021-11-04 12:25:26 -03:00
LOuroboros
b64d506809 Made a function to lift Mimicry's effect 2021-11-04 12:20:31 -03:00
LOuroboros
4f251e6ec2 Moved VARIOUS_TRY_TO_REVERT_MIMICRY to VARIOUS_REMOVE_TERRAIN 2021-11-04 12:13:55 -03:00
LOuroboros
e0b53f87fc Primal Reversion Tweaks 
-Fixed the inconsistent Primal Reversion activation in double battles.
-Optimized the primal weather checks in attackcanceler a little.
-Fixed the issue with multi-target fire/water moves during primal rain/sun.
 2021-11-04 12:04:14 -03:00
ghoulslash
6b10801ee8 convert AI_IsabilityOnSide to bool 2021-11-04 10:43:33 -04: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
28e78cb6c4 Gen 8 moves initial commit 
Full credit to Nunuchu42 and cfmnephrite for this code.
 2021-11-04 19:50:54 +13:00
BuffelSaft
7d10097684 Replace IsTwoStrikesMove with FLAG_TWO_STRIKES 
Note that this flag does nothing until the Parental Bond PR is merged - it's just for the AI until then.
 2021-11-04 17:11:56 +13:00
BuffelSaft
4a7ddb737b Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai_improvements 2021-11-04 15:51:11 +13:00
BuffelSaft
e930dae278 Remove ability pop up for Hunger Switch 
Morpeko should change form each turn without showing its ability.
 2021-11-04 15:40:26 +13:00
BuffelSaft
616be576fc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2 2021-11-04 15:29:38 +13:00
LOuroboros
b931e34172 Handled Mimicry's interaction with Steel Roller's effect 2021-11-03 23:23:28 -03:00
ghoulslash
4466fbd930 ai version of CanPoisonType, CanBePoisoned and IsAbilityOnSide 2021-11-03 21:36:33 -04:00
BuffelSaft
eeb40daede Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil2 2021-11-04 13:52:58 +13:00
GriffinR
d6f873ba69 Continue menu documentation 2021-11-03 20:38:23 -04:00
Eduardo Quezada D'Ottone
6ee2a3aba1 Merge branch 'BattleEngine' into booleanStandard 
# Conflicts:
#	src/battle_main.c
 2021-11-03 20:44:25 -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
BuffelSaft
6132f9a9fe
Merge pull request #1750 from ghoulslash/mirror_armor 
Mirror Armor
 2021-11-04 11:43:59 +13:00
BuffelSaft
5a855db4ad Fix prototype of CanBePoisoned 2021-11-04 11:08:37 +13:00
GriffinR
085f8adec6 Start remaining menu documentation 2021-11-03 17:38:08 -04:00
GriffinR
9a0618afc3 Add COPYWIN constants 2021-11-03 15:29:18 -04:00
ghoulslash
48c29a9cd8 proper mirror armor sticky web targeting 2021-11-03 15:05:52 -04:00
GriffinR
3e49ac804b
Merge branch 'master' into doc-finalmisc 2021-11-03 13:56:22 -04:00
GriffinR
e14210ce1f
Merge pull request #1536 from GriffinRichards/clean-braille 
Add font id constants, better braille support
 2021-11-03 13:17:29 -04:00
GriffinR
0ba22ca112
Merge pull request #1534 from GriffinRichards/doc-btrans 
Document battle transition
 2021-11-03 11:26:20 -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
Blackforest92
b9c23f7c62 Update waterfall, trick room, & focus blast BG 2021-11-03 16:29:09 +07:00
BuffelSaft
6ce1f01b8c Hunger Switch and Aura Wheel 
Implement the ability Hunger Switch and the move Aura Wheel.
 2021-11-03 19:45:03 +13:00
BuffelSaft
74c85b5818 Implement Relic Song's form change 
Meloetta transforms into its pirouette form after using Relic Song, unless it has Sheer Force or the move has no effect. It also has a chance to put both targets to sleep.
 2021-11-03 17:23:33 +13:00
BuffelSaft
f323e2c047 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil 2021-11-03 14:18:28 +13:00
GriffinR
afb9ff3a40 Document files with a few remaining symbols 2021-11-02 18:06:06 -04:00
cbt6
3556024a06 Distinguish clearly the two enums related to speed 2021-11-03 02:51:30 +08:00
cbt6
3f5f057ebe Rename GoSpeedX functions to WalkNormal, WalkFast, etc. 2021-11-03 01:50:53 +08:00
cbt6
4cedd2d551 Rename WalkFastest functions to WalkFaster 2021-11-03 01:50:53 +08:00
LOuroboros
69b42de0d9 Implemented Mimicry 
Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
 2021-11-02 14:44:55 -03:00
ghoulslash
4c9f48e9d8
Merge pull request #1842 from AsparagusEduardo/be_Gen8ContestData 
Added Gen 8 contest data
 2021-11-02 12:50:45 -04:00
ghoulslash
ffcba355b0 merge w be 2021-11-02 10:36:08 -04:00
BuffelSaft
95435b5f7f Pastel Veil switchin effect attempt 
Battle script isn't working for partner for some reason.
 2021-11-02 23:06:10 +13:00
BuffelSaft
40bced517a Pastel Veil blocks poison for whole side 
Tested vs Toxic, Toxic Thread and Sludge with 100% effect chance.
 2021-11-02 20:00:57 +13:00
Blackforest92
2d5ed4a1e2 Allow Giga Impact fadein background & upgrade its graphic 2021-11-02 12:53:11 +07:00
BuffelSaft
1e3b3d482b
Merge pull request #1838 from Blackforest92/battle_engine 
Edit Spacial Rend and Hurricane background
 2021-11-02 17:11:47 +13:00
Eduardo Quezada D'Ottone
8332bfae46 Gen 8 combo moves 2021-11-01 21:59:34 -03:00
Eduardo Quezada D'Ottone
f3013d8ee9 Standarized Solarbeam into Solar Beam 2021-11-01 18:36:35 -03:00
GriffinR
54a70ca4d4
Merge pull request #1530 from GriffinRichards/doc-graphics 
Label remaining symbols in graphics.c
 2021-11-01 17:00:06 -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
ef2971d8dc Convert GF ROM header to C 2021-11-01 01:42:02 -04: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
ghoulslash
52d4d1cd34 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella 2021-10-31 11:40:00 -04:00
ghoulslash
bc170f3a43 merge with be 2021-10-31 11:04:39 -04:00