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
GriffinR
36039e1b86
Convert fonts.s to C
2021-10-31 01:44:18 -04:00
ghoulslash
e1f0e6285b
Merge pull request #1828 from BuffelSaft/gorilla-tactics
...
Implement Gorilla Tactics
2021-10-30 21:44:33 -04:00
ghoulslash
468ee66cd8
fix synthesis and leaf guard w utility umbrella
2021-10-30 11:04:50 -04:00
GriffinR
875be8a8a8
Merge pull request #1528 from GriffinRichards/doc-ereaderscr
...
Document ereader screen
2021-10-30 09:34:14 -04:00
ghoulslash
ee7b63e372
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella
2021-10-30 09:26:33 -04:00
ghoulslash
f4537b1213
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into wandering_spirit
2021-10-30 09:14:32 -04:00
Blackforest92
799852ea77
Introduce alternate Steel Beam
2021-10-30 17:00:55 +07:00
BuffelSaft
52054e4bfe
Fix Corrosion, Poison Touch
...
- CanBePoisoned now calls CanPoisonType instead of overriding it. Poison Touch now activates only if the attacker actually damaged the target. Partially implemented Pastel Veil.
2021-10-30 21:12:18 +13:00
BuffelSaft
47bfeaeecd
Implement Gorilla Tactics
...
It's Choice Band but as an ability.
2021-10-30 18:31:44 +13:00
ghoulslash
af914ee7ed
merge w be
2021-10-29 22:33:50 -04:00
ghoulslash
28bc7dc14d
start ability
2021-10-29 22:32:19 -04:00
BuffelSaft
6b65ef5bcf
Merge pull request #1824 from ghoulslash/itemheal_fix
...
Fix iteam healing after a failed move
2021-10-30 15:25:28 +13:00
BuffelSaft
f0e9b09258
Merge pull request #1822 from ghoulslash/harvest
...
fix recycle and harvest
2021-10-30 15:00:56 +13:00
GriffinR
f51247615e
Finish documenting battle_transition
2021-10-29 18:32:53 -04:00
cbt6
9a1764f83e
Label some animation index numbers
2021-10-30 01:37:49 +08:00
GriffinR
07bf225f94
Continue battle_transition documenting
2021-10-29 11:24:36 -04:00
ghoulslash
2502820e83
document a couple hitmarkers. fix failing moves not updating hp from own healing effects
2021-10-29 09:03:14 -04:00
ghoulslash
204748e01a
fix recycle and harvest
2021-10-28 17:52:52 -04:00
ghoulslash
f342e7c590
merge with be
2021-10-28 17:03:10 -04:00
ghoulslash
e2e31f0b74
skill swap config option for switchin abilities
2021-10-28 16:53:00 -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
ghoulslash
34e966fdee
Merge pull request #1815 from LOuroboros/hyperspaceFury
...
Implemented Hyperspace Fury
2021-10-28 13:20:33 -04: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
GriffinR
41ecae91f8
Label remaining symbols in graphics.c
2021-10-27 13:47:18 -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
773c773bac
Merge remote-tracking branch 'RHH/battle_engine' into BE_ghostEscape
...
# Conflicts:
# include/constants/battle_config.h
2021-10-26 20:35:01 -03:00
GriffinR
b0c27a8521
Document ereader screen
2021-10-26 15:44:42 -04:00
GriffinR
f9f91be60a
Merge pull request #1527 from cbt6/field-player
...
Document field player functions
2021-10-26 14:29:44 -04:00
GriffinR
d6571f2355
Merge pull request #1525 from GriffinRichards/doc-recmix
...
Document remainder of Record Mixing
2021-10-26 14:18:38 -04:00
cbt6
b3d779fd0d
Document field player functions
2021-10-27 01:39:00 +08:00
GriffinR
4f7f6c1082
Merge pull request #1526 from sphericalice/doc-curtain-special
...
Document the CloseBattlePikeCurtain special
2021-10-25 16:10:45 -04:00
sphericalice
7b5267c799
Rename TILESET_WIDTH to METATILE_ROW_WIDTH
2021-10-25 20:51:04 +01:00
sphericalice
5bce17cbce
Fix typo in the TILESET_WIDTH comment
2021-10-25 18:11:06 +01:00
sphericalice
120e75d275
Document the CloseBattlePikeCurtain special
2021-10-25 18:03:14 +01:00
GriffinR
a612c27f2d
Drop battle transition 'phase' terminology
2021-10-25 10:20:48 -04:00
GriffinR
6dc3c9864c
Merge pull request #1520 from GriffinRichards/doc-random
...
Document random remaining symbols
2021-10-24 23:43:17 -04:00
Eduardo Quezada D'Ottone
44625561e5
Taunt turn config
2021-10-24 20:21:54 -03:00
Eduardo Quezada D'Ottone
70aeaf288f
Rough Skin damage config
2021-10-24 20:07:22 -03:00
Eduardo Quezada D'Ottone
8699db942b
More ordering
2021-10-24 20:03:21 -03:00
GriffinR
7a89ad98c3
Document record mixing hall records
2021-10-24 16:13:07 -04:00
GriffinR
ab80264921
Merge pull request #1519 from GriffinRichards/doc-mgift
...
Document Mystery Gift
2021-10-24 15:50:39 -04:00
GriffinR
7f3c529935
Document record mixing mail swap
2021-10-24 15:49:19 -04:00
BuffelSaft
4310868bee
AI handles multi-strike and fixed dmg moves
...
Does not account for Parental Bond or Beat Up yet as those require some functions from #1676 .
2021-10-24 18:49:17 +13:00
Eduardo Quezada D'Ottone
71ff664700
Ordered config into new categories
2021-10-23 20:11:02 -03:00
Eduardo Quezada D'Ottone
d95351dd97
Merge branch 'BattleEngine' into BE_config
...
# Conflicts:
# include/constants/battle_config.h
2021-10-23 19:46:33 -03:00
Eduardo Quezada D'Ottone
abb8a97d21
Merge pull request #1616 from LOuroboros/statCalcs
...
Added configs for modern post-battle stat calcs
2021-10-23 13:35:21 -03:00
Eduardo Quezada D'Ottone
9a8b88bdb3
Updated config description
2021-10-23 11:59:57 -03:00
Eduardo Quezada D'Ottone
76b6250104
Merge branch 'battle_engine' into plasmaFists
2021-10-23 11:06:34 -03:00
Jademalo
62436d9f67
IDE support formatting and consistency
2021-10-23 10:10:00 +01:00
Eduardo Quezada D'Ottone
382ec13492
Merge pull request #1752 from ghoulslash/quick_draw
...
Quick Draw
2021-10-22 22:39:03 -03:00
Eduardo Quezada D'Ottone
d0253640fb
Merge pull request #1739 from LOuroboros/primalReversionBE
...
Implemented Primal Reversion
2021-10-22 22:27:45 -03:00
Jademalo
eb860a368e
Improve IDE support
2021-10-22 04:30:33 +01:00
GriffinR
303ce856ad
Fix GET_CARD_BATTLE_LOST typo
2021-10-21 16:54:16 -04:00
GriffinR
bc409baeff
Fix incorrect NUM_SECTORS_PER_SLOT define
2021-10-19 16:30:00 -04:00
ghoulslash
416c517e49
Merge pull request #1786 from Xavion3/damage_debug
...
Adds simulated damage to the debug menu
2021-10-19 12:14:38 -04:00
LOuroboros
a6315ffc75
Implemented Plasma Fists
2021-10-19 09:50:18 -03:00
ghoulslash
eda99fcf29
Merge pull request #1742 from AsparagusEduardo/be_gStatuses4
...
Add gStatutes4
2021-10-19 08:45:47 -04:00
GriffinR
934a7e7a5d
Merge pull request #1516 from GriffinRichards/doc-miscbattle
...
Miscellaneous battle documentation
2021-10-19 08:09:17 -04:00
Xavion3
150dd7c633
Add damage information to the debug menus
2021-10-19 22:39:07 +11: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
GriffinR
24b4e898ad
More mauville_old_man clean up
2021-10-18 14:40:04 -04:00
GriffinR
b31bddddca
Clean up metatile_behavior
2021-10-18 12:54:29 -04:00
GriffinR
46dd10c87b
Clean up trainer_pokemon_sprites
2021-10-18 01:56:24 -04:00
GriffinR
db8ce5d7f9
Clean up mauville_old_man, drop ScrSpecial prefix
2021-10-18 01:09:41 -04:00
ghoulslash
8dc77e6fe3
Merge pull request #1782 from LOuroboros/glare
...
Updated Glare
2021-10-17 22:11:33 -04:00
GriffinR
ed6fdd743f
Some pokemon_icon clean up
2021-10-17 22:04:08 -04:00
GriffinR
a950f9c771
Clean up international_string_util
2021-10-17 21:51:11 -04:00
Eduardo Quezada D'Ottone
ead5c92469
Merge branch 'battle_engine' into PLG
2021-10-17 17:38:54 -03:00
LOuroboros
e7ad7319e3
Updated Glare
2021-10-17 12:03:35 -03:00
Eduardo Quezada D'Ottone
df817fb2ab
Merge pull request #1772 from LOuroboros/gravApple
...
Added Grav Apple's power boost
2021-10-17 09:51:29 -03:00
LOuroboros
59cfbe55c1
Gave Grav Apple a move effect of its own
2021-10-17 09:27:35 -03:00
GriffinR
ece7ef3410
Correct usage of MysteryEvent to MysteryGift
2021-10-17 03:00:48 -04:00
GriffinR
d0455485c3
Clean up mystery gift headers
2021-10-17 02:18:24 -04:00
GriffinR
3cd27acbea
Document wonder news
2021-10-17 02:09:31 -04:00
GriffinR
5f9069628d
Clean up mevent2
2021-10-17 01:35:26 -04:00
GriffinR
c7d550e96c
Clean up wonder card/news view
2021-10-17 01:15:16 -04:00
GriffinR
845a5e99cc
General mystery gift documentation, finish mystery gift client/server/scripts
2021-10-16 23:35:17 -04:00
ghoulslash
964e7efba9
fix MOVE_TARGET_ALL_BATTLERS and other u8 vars
2021-10-16 16:23:17 -04:00
ghoulslash
5509ceea04
expand move target field
2021-10-16 16:10:45 -04:00
BuffelSaft
df2223a5bc
Merge pull request #1745 from LOuroboros/retaliate
...
Implemented Retaliate's effect
2021-10-16 22:49:32 +13:00
LOuroboros
3b6ceb1dfa
Turned Retaliate into a side timer
2021-10-16 06:04:04 -03:00
GriffinR
e1900efe1e
Merge branch 'master' into doc-miscbattle
2021-10-15 22:46:43 -04:00
GriffinR
1f39c34ca4
Merge branch 'master' into minor-constants
2021-10-15 22:44:49 -04:00
GriffinR
a4a3c1c9e5
Merge pull request #1511 from GriffinRichards/doc-union
...
Document link_rfu / Union Room
2021-10-15 22:44:01 -04:00
ghoulslash
1f176242aa
add missing func definition
2021-10-15 16:06:50 -04:00
ghoulslash
c077091dbf
small fixes, check GetCatchingBattler's semi-invulnerability
2021-10-15 14:57:26 -04:00
ghoulslash
b94f710c80
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ballthrow
2021-10-15 14:49:37 -04:00
GriffinR
e3bb257bcf
Fix some trainer card link access
2021-10-15 12:22:19 -04:00
GriffinR
c02001c46d
Document mystery gift link scripts, general mystery gift
2021-10-15 12:05:06 -04:00
Eduardo Quezada D'Ottone
0a090616ef
Merge pull request #1765 from ghoulslash/shell_smash
...
Shell Smash Animation
2021-10-15 12:09:06 -03:00
ghoulslash
ef19c8c415
fix gen define
2021-10-15 09:22:50 -04:00
ghoulslash
883a249836
config for catching semi-invulnerable mons
2021-10-15 09:20:32 -04:00
LOuroboros
3a25bce185
Turned Retaliate's effect into a side status
2021-10-15 06:03:48 -03:00
LOuroboros
1f97198267
Oops, I forgot to take the opponent's side into account
2021-10-15 05:02:14 -03:00
Eduardo Quezada D'Ottone
21837b659a
Merge branch 'battle_engine' into bug_bite
2021-10-14 19:46:50 -03:00
