scnorton
|
c6ff1a6ce3
|
Merge branch 'master' into link
|
2018-01-18 12:53:31 -05:00 |
|
Diegoisawesome
|
0403f6eea9
|
Merge remote-tracking branch 'Egg/decompile_use_pokeblock'
|
2017-12-21 16:19:50 -06:00 |
|
Marcus Huderle
|
173761a5a1
|
Port generic event script macros from pokeruby
|
2017-12-21 13:47:52 -06:00 |
|
DizzyEggg
|
cb229f56e8
|
fix pokeblock conflicts
|
2017-12-18 16:58:14 +01:00 |
|
DizzyEggg
|
4351676749
|
decompile more of pokeblock.s
|
2017-12-16 00:08:23 +01:00 |
|
DizzyEggg
|
646664ff29
|
battle setup file is decompiled
|
2017-12-01 21:25:13 +01:00 |
|
PikalaxALT
|
236cbf96c8
|
Merge origin/master into pikalaxalt/link
|
2017-11-16 19:00:07 -05:00 |
|
Diegoisawesome
|
a98c6bf210
|
Fix build by renaming specials
|
2017-11-16 09:30:04 -06:00 |
|
Diegoisawesome
|
f497c1508b
|
Split files from event_scripts.s
Also move maps/scripts to scripts/maps
|
2017-11-11 16:10:17 -06:00 |
|