ultima-soul
daf5e0167e
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-02-03 16:06:48 -08:00
ExpoSeed
4a8e18cea2
Merge pull request #1336 from LOuroboros/cries_PE_redux
...
Various tweaks related to Pokémon cries
2021-02-03 11:26:44 -06:00
LOuroboros
fc04c6974b
Edit->Blank Operations->Trim Trailing Space for the win
2021-02-01 17:05:49 -03:00
LOuroboros
0da2fd0dcb
Renamed cry_not and cry2_not macros
2021-01-18 11:43:34 -03:00
Evan
1e22ae4cf2
merge with be
2021-01-10 09:08:25 -07:00
ExpoSeed
7dadcb94b8
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-03 17:14:43 -06:00
ExpoSeed
10f4b48215
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-01 14:14:51 -08:00
GriffinR
769ddf22c2
Label remaining subs in battle_tower.c
2020-12-24 16:18:47 -05:00
Evan
b85dacce9d
fix conflicts
2020-12-14 08:50:41 -07:00
Evan
d5ad14c349
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into popup
2020-12-05 21:03:20 -07:00
Evan
21cab1b7a7
better negative totem boost system, totems occur before switch in abilities
2020-12-05 21:00:51 -07:00
Evan
4ad5e368a9
fix merge conflicts
2020-12-01 17:57:57 -05:00
Eduardo Quezada D'Ottone
7aa999af59
Merge pull request #1235 from ultima-soul/ability_expansion
...
Expand Ability IDs to u16, Add SWSH Ability Data, and Remove Cacophony
2020-11-28 14:56:01 -03:00
Evan
ef43596a79
toggleable manual ability popup destruction
2020-11-19 15:16:27 -07:00
Evan
1c398c3d4b
totem format fixes
2020-11-19 10:37:15 -07:00
Evan
99d9a36860
add totem boosts
2020-11-19 10:35:37 -07:00
Aaron B-D
151aca8365
Changed how scripted wild encounters work to include double battles
...
Removed the old commands for scripted wild double encounters
2020-11-17 03:13:00 -05:00
ultima-soul
e32659d4bb
Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities.
2020-11-16 13:50:26 -08:00
Aaron B-D
b83a87c8e8
Added scripted double wild battles
2020-10-19 14:47:32 -04:00
ExpoSeed
9e2c8a95c1
Sync bev2 with pret
2020-10-11 01:01:47 -05:00
ExpoSeed
5794fc69e8
Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-pokemon-expansion
2020-10-04 02:35:23 -05:00
ExpoSeed
3860551777
Mark unused script commands
2020-09-25 13:41:17 -05:00
Kurausukun
f4a49dcd1d
Make all arguments for audio macros required
2020-09-17 19:56:55 -04:00
Kurausukun
b9644e9583
Update Audio Macros
...
Information: Our current audio macros preclude the definition of root
key and pan (applicable when used in drumsets, aka "keysplit_all") for
GB channels. However, this functionality does exist in m4a--Pokemon
Emerald just happens not to use it. However, for the sake of people
working with custom music, I believe these values should be modifiable
by users.
Additionally, given the recent events that have occurred with this repo,
I would like to make something fully clear: I have indeed looked at the
GBA SDK before, which contains notes on how these sounds are defined;
therefore, I cannot blame you if you reject this PR on the grounds that
the information is "tainted." However, this information is readily
available and matches the same macros used for directsound--it's hardly
information that one would need the source to know.
2020-09-17 03:12:19 -04:00
DizzyEggg
f70a9ce153
Merge with master
2020-08-27 12:01:28 +02:00
DizzyEggg
c2733236be
Merge with master
2020-08-27 11:36:35 +02:00
GriffinR
fbb70b3727
Document contest AI scripts
2020-08-21 14:57:17 -04:00
GriffinR
469ec5f248
Document contest AI commands
2020-08-21 02:36:48 -04:00
GriffinR
65bd2faf94
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest
2020-08-16 05:59:10 -04:00
DizzyEggg
43359f39c3
Merge with master
2020-07-27 15:28:03 +02:00
DizzyEggg
0066640a1e
Merge with master
2020-07-27 14:51:39 +02:00
DizzyEggg
3a220d0733
ai tweaks
2020-07-26 13:48:25 +02:00
GriffinR
aca50c87be
Continue new contest documentation
2020-07-24 00:14:53 -04:00
GriffinR
af09e73d67
Merge branch 'master' into doc-overworld
2020-07-18 20:24:09 -04:00
GriffinR
aba42513d3
Clean up some battle scr cmd data
2020-07-18 18:10:15 -04:00
DizzyEggg
ec4c73711e
Rest Sleep Talk wake up awaraness
2020-07-15 21:30:24 +02:00
DizzyEggg
1a94d27fe6
Emergency Exit
2020-07-15 17:21:12 +02:00
GriffinR
e129d04b93
Merge branch 'master' into doc-overworld
2020-07-15 00:40:47 -04:00
DizzyEggg
ff5fc97859
Merge with master
2020-07-11 14:07:10 +02:00
DizzyEggg
4c3f40a361
Merge with master
2020-07-11 12:59:23 +02:00
Ryuhouji
8e2128f22c
Fix indentation
2020-07-09 15:36:22 -04:00
Ryuhouji
d261374044
Made documentation more readable
...
This change will make the script command documentation more user-friendly to read.
Additionally, provided the information on the 'delay' macro. I have confirmed that this
is indeed Frames and not Milliseconds. Updated the macro respectively.
2020-07-09 15:16:37 -04:00
GriffinR
4ea6992172
Continue documenting overworld/field effects
2020-06-29 01:26:29 -04:00
Eduardo Alvaro Quezada D'Ottone
9fb073ca23
Some cleanup ( #454 )
...
* Toxic Thread doesn't have power.
* Added missing commas.
* Autotomize typo.
It wasn't until today that I learned that autotomize was a word.
2020-06-27 11:21:13 +02:00
DizzyEggg
548a43f8d9
Rocky Helmet before Knock Off
2020-06-25 16:15:11 +02:00
DizzyEggg
19699bee23
Merge pull request #390 from ghoulslash/battle_engine
...
add animations for all moves
2020-05-29 12:53:17 +02:00
Eduardo Alvaro Quezada D'Ottone
8d848997c9
Battle Configs: The Revenge ( #363 )
...
* Turns for Uproar
* Chances for the amount of hits with multi-hit moves.
* Electric type mon's immunity to paralysis
* (Hi) Jump Kick to always do 1/2 of maxHP when crashing
* Turns for Disable.
* Minimized mons can always be hit by moves like Stomp
* Grass types immune to powder and spore moves.
* Psywave's damage formula
* Fixed random usage.
2020-05-28 10:38:27 +02:00
Evan
6c20a49dc6
animations for all moves
2020-05-25 00:37:32 -06:00
ultima-soul
9ee5db6a96
Expand ability ids to u16. Thanks to ghoulslash for some assistance!
2020-05-18 14:54:12 -07:00
DizzyEggg
4fc88d18aa
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2
2020-04-29 09:17:25 +02:00
