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
