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
23bf41713c
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-12-01 20:17:08 -08:00
ultima-soul
0312c5be8b
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-27 21:38:26 -08:00
GriffinR
e0fae879da
Merge pull request #1558 from GriffinRichards/update-macros
...
Update event macro comments
2021-11-22 19:10:49 -05:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
GriffinR
23dd1dad7f
Fix incorrect palettes in Mauville flower tileset anims
2021-11-21 11:23:03 -05:00
GriffinR
42a83ee50e
Use STR_VAR names for apprentice_buff and frontier_gettrainername
2021-11-18 23:20:05 -05:00
GriffinR
e66ea0cb99
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
GriffinR
6c6487dd7a
Missing spaces to tabs in scripts files
2021-11-18 21:02:22 -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
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
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
GriffinR
65d3b58374
Add PARTY_NOTHING_CHOSEN
2021-11-15 10:57:06 -05:00
GriffinR
f85de6eca5
Start event macro comment updates
2021-11-15 10:54:57 -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
ghoulslash
940a165be7
merge w be
2021-11-13 09:09:15 -05: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
Eduardo Quezada D'Ottone
704957efb9
Fixed Relic Song's SE
2021-11-13 07:30:12 -03:00
BuffelSaft
e606e54f9d
Fix Big Pecks/Octolock animation
...
Also removed MOVE_EFFECT_AFFECTS_USER because that shouldn't be part of playstatchangeanimation. The stat drops still bypass Mirror Armor without this.
2021-11-11 14:32:38 +13:00
BuffelSaft
e637714e1b
Requested changes
...
Various bug fixes, syntax corrections etc.
2021-11-10 21:11:15 +13: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
Blackforest92
76ba9d835a
pulled latest RHH battle_engine 08-11-2021
2021-11-08 16:38:42 +07: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
c2a17510a9
Terrain Pulse animations
2021-11-07 11:25:08 -03:00
Eduardo Quezada D'Ottone
e9804a5023
Secret Power animation config
2021-11-06 17:32:34 -03:00
ghoulslash
41bf1dc2f4
merge w be
2021-11-06 10:40:57 -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
BuffelSaft
14ebba04af
Align comment with others
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-11-06 12:43:57 +13: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
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
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
cbt6
32aaf6912f
Rename movement scripts to use Faster over Fastest
2021-11-05 02:22:28 +08: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
4f251e6ec2
Moved VARIOUS_TRY_TO_REVERT_MIMICRY to VARIOUS_REMOVE_TERRAIN
2021-11-04 12:13:55 -03:00
BuffelSaft
c9ae140bd1
Fix Clangourous Soul
...
I broke this while trying to tidy up the code, it worked perfectly before. Also, make sure the "recoil' doesn't break Disguise.
2021-11-04 21:50:42 +13:00
BuffelSaft
ecbe048f96
Fix Octolock
...
Fixed two issues:
- Octolock doesn't have an end of turn animation in gen 8
- The def drop anim wasn't played if Sp. Def was at -6 and def could still drop
2021-11-04 21:26:04 +13: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
