Commit Graph

17 Commits

Author SHA1 Message Date
PikalaxALT
6b2d0ae841 Fix merge conflicts 2015-11-01 18:19:52 -05:00
PikalaxALT
010b450834 Prepare to merge 2015-11-01 18:13:31 -05:00
PikalaxALT
8153737bae Enumerate text constants 2015-10-30 10:34:35 -04:00
JimB16
3b9a3cc3be merge conflicts resolved 2015-10-19 16:25:15 +02:00
PikalaxALT
8c2766e1b9 ldtile and dwtile macros added and globally implemented 2015-10-13 12:11:06 -04:00
PikalaxALT
327faac497 Magikarp functions moved to event/magikarp.asm 2015-10-11 12:26:39 -04:00
JimB16
0001c688d3 found functions that determine next OTPkmn 2015-09-12 04:21:00 +02:00
JimB16
a7cb2a5e9b changed more labels 2015-09-10 01:27:07 +02:00
JimB16
0d4c2776d9 changed varlabels for multiply- and divide-func, renamed battletext-labels 2015-09-06 23:38:01 +02:00
JimB16
0e05c91239 change WasSentToBillsPC-Label 2015-08-23 16:08:01 +02:00
PikalaxALT
39524cdb76 More enumeration of constants, more annotations of scripts. 2015-07-15 15:48:44 -04:00
yenatch
e2c2e20f93 Use charmaps for special string codepoints.
Also fix all the text.
Also fix some unreferenced scripts that were interpreted as text.
2015-06-27 22:53:38 -07:00
yenatch
80b0d8cd2d Use wram labels in common text. 2015-02-10 14:18:29 -08:00
yenatch
fd6cfc73ee Text macros in text/. 2014-03-06 00:45:28 -05:00
yenatch
3070aeb915 make way for bank 6f 2013-07-28 03:39:05 -04:00
IIMarckus
5ac569e5f3 Add pointers to Oak speech text. 2013-05-12 16:55:25 -06:00
yenatch
59f6291afb Split common text out of main.asm 2013-02-17 02:19:49 -05:00