Commit Graph
25 Commits
Author SHA1 Message Date
garak ecd482fa2c fix merge conflicts in battle_anim_scripts 2018-10-19 16:19:36 -04:00
garak 38fcc46abb Merge remote-tracking branch 'upstream/master' into pan-constants 2018-10-19 16:05:14 -04:00
garak 901f3ff557 use sound panning constants in battle_anim_scripts 2018-10-19 15:57:19 -04:00
garak 113a8d1efd clean flags and remove temp macro 2018-10-19 14:59:18 -04:00
garak 1441ee6bc3 finish event object flags 2018-10-19 13:04:47 -04:00
garak cb5981cdf2 name more event flags 2018-10-18 21:32:21 -04:00
garak c27043bd3c more event flags 2018-10-18 15:28:59 -04:00
garak d1b7f32b0a begin event flag names, add temporary hidden item macro 2018-10-17 22:07:23 -04:00
garak 7d88b9647f Merge branch 'master' into event-flags 2018-10-17 12:30:45 -04:00
garak ff97873c30 label temp flags, test replace script 2018-10-17 12:25:12 -04:00
garak 624a7552b6 use event flags in event scripts 2018-10-17 09:05:22 -04:00
garak da1b5365a7 label a flag in the asm 2018-10-17 08:55:09 -04:00
garak 0051947414 Merge remote-tracking branch 'upstream/master' into event-flags 2018-10-16 14:31:45 -04:00
garak 72f9afcbf4 Merge remote-tracking branch 'upstream/master' 2018-09-24 08:40:33 -04:00
garak 3964dbd482 Merge branch 'master' of https://github.com/garakmon/pokeemerald 2018-09-24 08:39:26 -04:00
Garak e0a9faacb5 sha1sum -> sha1 2018-08-11 21:29:54 -04:00
Garak 2cfc7bd358 change darwin check 2018-08-11 21:21:43 -04:00
Garak 296a539664 add faster builds and NODEP sections from pokeruby 2018-08-11 21:19:27 -04:00
garak 0d6f8ba5e4 add INSTALL sections for faster builds and NODEP 2018-08-11 21:13:37 -04:00
Garak 9ee4c23a46 remove -j4 2018-08-11 21:11:28 -04:00
garak 5d899d00e0 tone down INSTALL steps 2018-08-11 21:06:27 -04:00
garak 2fc3b7f171 change sUnknown_085A1E3C to sMapHealLocations 2018-08-11 10:28:13 -04:00
garak c3512e3b39 port larger heal location changes from poke ruby pr 2018-08-10 10:45:15 -04:00
garak 45b730e474 copy heal_location changes from pokeruby 2018-08-07 23:05:48 -04:00
Garak 96ab357bed Merge pull request #3 from pret/master
syncing with source repo
2018-08-07 22:21:10 -04:00