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
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
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
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
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
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
DizzyEggg
0ed8b9337e
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion
2020-04-29 09:04:28 +02:00
GriffinR
b1d26e10a8
Sync map header property names with pokefirered
2020-04-28 19:59:08 -05:00
DizzyEggg
3c938d1809
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion
2020-02-23 12:42:21 +01:00
PikalaxALT
91dd7f5cc3
Port librfu from firered
2020-02-16 13:49:36 -05:00
GriffinR
4c12ad00d2
Merge branch 'master' into fix-eventobj
2020-01-19 21:57:29 -05:00
DizzyEggg
26e109d788
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion
2020-01-18 15:06:43 +01:00
jiangzhengwenjz
46b00b11d4
match all the functions
2020-01-16 08:14:27 -06:00
jiangzhengwenjz
8a5f292618
document symbols
2020-01-16 08:14:27 -06:00
GriffinR
e92cc7752b
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
huderlem
6d6c57f383
Merge pull request #953 from GriffinRichards/sync-script
...
Port some macro/script fixes from pokefirered
2020-01-13 19:33:47 -06:00
GriffinR
c19289596d
Give/Take to Add/Remove for silent script macros
2020-01-12 23:24:52 -05:00
GriffinR
655910a16f
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
GriffinR
e497fc64e3
if_undefeated macro to if_not_defeated
2020-01-12 20:20:02 -05:00
GriffinR
f2e7b1507e
Port some macro/script fixes from pokefirered
2020-01-11 14:12:31 -05:00
GriffinR
ef67f2d33b
Merge master into ObjEvent rename and prune accidental inclusions
2020-01-08 05:43:06 -05:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome
2020-01-08 01:15:36 -05:00
GriffinR
fb5bea98ce
More battle_dome.c doc
2020-01-07 22:30:37 -05:00
DizzyEggg
cd4c3b38b5
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion
2019-12-30 13:53:59 +01:00
GriffinR
3efc8199d4
More battle_dome.c documentation
2019-12-25 22:27:33 -08:00
huderlem
ee61726136
Merge pull request #936 from GriffinRichards/doc-tower
...
Document Battle Tower scripts
2019-12-25 11:39:20 -06:00
DizzyEggg
a4a4132d26
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion
2019-12-23 16:41:44 +01:00
GriffinR
68cdd7b1cb
Merge master into ObjEvent rename
2019-12-21 05:19:27 -05:00
Diegoisawesome
026e1108b2
Merge pull request #935 from GriffinRichards/doc-warp
...
Document some warp/field screen effect
2019-12-20 23:44:56 -08:00
Diegoisawesome
d42ea06dc5
Merge pull request #939 from GriffinRichards/fix-compare
...
Use constants in compare macro
2019-12-20 23:40:12 -08:00
GriffinR
324a81ed5d
Reword yesnobox comment
2019-12-20 18:53:58 -05:00
GriffinR
63c8cf97d1
Document Battle Dome scripts and some battle_dome.c
2019-12-20 16:53:33 -05:00
GriffinR
7628019952
Remove references to LASTRESULT
2019-12-20 08:51:58 -05:00
GriffinR
9e08cfe55f
Remove uses of compare_var_to
2019-12-18 19:22:39 -05:00
GriffinR
d137a1a0c1
Use constants in compare macro
2019-12-18 19:12:09 -05:00
GriffinR
949509aade
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
GriffinR
23f952b34e
Merge master into doc-tower
2019-12-17 21:17:46 -05:00