ghoulslash
90ddc8d706
Merge pull request #1849 from BuffelSaft/pastel_veil2
...
Add Pastel Veil, fix Corrosion and Poison Touch
2021-11-03 21:01:28 -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
PikalaxALT
7940f121f6
Merge pull request #1539 from GriffinRichards/doc-finalmisc
...
Document files with a few remaining symbols
2021-11-03 20:49:14 -04:00
PikalaxALT
6bdf6f25f4
Merge pull request #1540 from GriffinRichards/sync-libgcn
...
Sync libgcnmultiboot
2021-11-03 20:45:54 -04:00
GriffinR
d6f873ba69
Continue menu documentation
2021-11-03 20:38:23 -04:00
GriffinR
50d3003a0d
Text clean-up, TEXT_SPEED_FF to TEXT_SKIP_DRAW
2021-11-03 19:54:20 -04:00
ghoulslash
86ad65df76
Merge pull request #1675 from AsparagusEduardo/booleanStandard
...
Using boolean for flags
2021-11-03 19:52:52 -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
LOuroboros
f0d7c75ec8
Syntax corrections
2021-11-03 17:48:04 -03: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
ghoulslash
7e6e23005b
fix clear body
2021-11-03 13:59:26 -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
GriffinR
b16b918266
Merge pull request #1541 from cbt6/move-speed
...
Use constants for movement speeds
2021-11-03 11:18:54 -04:00
cbt6
fca863244b
Index sStepTimes and sNpcStepFuncTables
2021-11-03 23:07:05 +08:00
cbt6
680f5f4458
Revert movement speed constants for jump movements
2021-11-03 23:00:37 +08:00
cbt6
87a094edcb
Use constants for movement speeds
2021-11-03 20:51:41 +08: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
5141e84296
Fix base stats
...
Clean up mess from testing.
2021-11-03 20:01:09 +13: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
18b87416d5
Fixes
...
- Fix Sheer Force interaction (needed after adding | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN)
- Fix "X Transformed!" target
- Allow switching between both forms
- Allow form change if target is KO'ed
2021-11-03 17:56:16 +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
d33bcc335b
Revert Poison Touch target check
...
This would prevent Poison Touch activating if the target hurt itself.
2021-11-03 14:49:14 +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
dc44548e43
Sync libgcnmultiboot
2021-11-02 20:28:17 -04:00
Eduardo Quezada D'Ottone
11e93aee69
Merge pull request #1848 from SBird1337/fix/ub
...
[battle_debug] fix charbase overflow
2021-11-02 21:24:46 -03:00
sbird
5bfb3096ad
[battle_debug] fix charbase overflow
2021-11-02 23:53:03 +00:00
BuffelSaft
d99fd30e4d
Looping battle script, correct message
...
Testing in Sword showed that the pop up should happen once if two mons are cured, and that the correct message is "X was cured of its poisoning!"
2021-11-03 11:51:20 +13:00
GriffinR
929aade0fd
Fix braille slash
2021-11-02 18:34:05 -04:00
GriffinR
afb9ff3a40
Document files with a few remaining symbols
2021-11-02 18:06:06 -04:00
GriffinR
c98fbb5ca6
Merge pull request #1538 from cbt6/move-speed
...
Rename some player movement speed functions
2021-11-02 15:07:59 -04:00
cbt6
510ccbdf4c
Move definition of constants for movement speed
2021-11-03 02:56:23 +08: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
cbt6
a2c2d7e230
Label indexes for movement speeds
2021-11-03 01:50:47 +08:00
LOuroboros
69b42de0d9
Implemented Mimicry
...
Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
2021-11-02 14:44:55 -03:00
Blackforest92
0f5c9f5cb0
Adjust Giga Impact background to fade in before impact
2021-11-03 00:37:22 +07: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
592a1dab63
fix mirror armor setstatchanger, handle reflected stat blockage
2021-11-02 12:02:58 -04:00
ghoulslash
ffcba355b0
merge w be
2021-11-02 10:36:08 -04:00
BuffelSaft
4668e11765
Looping battlescript version 1
...
Would be better if it simply updated the target, cured the status and returned I think, needs testing.
2021-11-03 00:45:24 +13: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
