Commit Graph

53 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
9a9cb38e39 merge with newest update 2015-10-26 03:26:53 +01:00
PikalaxALT
119d6b4119 About time I got to these functions 2015-10-24 10:39:52 -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
4b722eb530 changed name of some labels 2015-10-10 13:45:39 +02: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
c76a3c6ecd changed more labels 2015-09-04 22:30:40 +02:00
JimB16
706f289c70 change more labelss 2015-08-25 01:56:30 +02:00
JimB16
0e05c91239 change WasSentToBillsPC-Label 2015-08-23 16:08:01 +02:00
JimB16
3922ad2c3c changed labels and added comments 2015-08-23 15:09:56 +02:00
PikalaxALT
c8960dd2c8 Various annotations
Annotated the SGB functions in predef/sgb.asm, and some of the map scripts.  Renamed several functions in home.  Renamed six WRAM addresses corresponding to party icon animations, and renamed several others relative to these.
2015-07-22 15:57:02 -04:00
PikalaxALT
471492b775 Reverted ld_hl_pointer macro 2015-07-20 22:18:18 -04:00
PikalaxALT
0fcef5fc08 More annotations and interpretations of functions and scripts 2015-07-17 17:17:10 -04: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
IIMarckus
fdfbeb7e5f More std enums. 2015-06-24 19:26:24 -06:00
IIMarckus
5d48bc96fd More std_scripts enums. 2015-06-23 15:02:58 -06:00
IIMarckus
7ac6aa2d22 Begin enumerating std_scripts constants. 2015-06-23 14:21:54 -06:00
IIMarckus
4d532beee6 Remove trailing newlines. 2015-06-23 12:24:51 -06:00
IIMarckus
47938939fe Give Buena's phone scripts more appropriate filenames. 2015-06-23 11:43:32 -06:00
IIMarckus
2bf3a322ba Labels for "sent some to mom" text. 2015-06-11 10:57:45 -06:00
yenatch
7c862ca7e2 Blind wram part 5.
starting to go smoothly
2015-02-10 15:43:27 -08:00
yenatch
80b0d8cd2d Use wram labels in common text. 2015-02-10 14:18:29 -08:00
yenatch
e2ec8a1d13 Recomment type names.
This is mostly just whitespace reduction.
2014-07-09 12:50:33 -07:00
yenatch
bc3a21193d Residual damage, battle text labels, pic predefs. 2014-06-18 00:55:44 -07:00
yenatch
e23f341258 Battle type constants in the wild.
Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
yenatch
23f9b5d21e Use constants for move struct positioning.
This eliminates the need for arbitrary move labels like Move2 and Move1 that don't have anything to do with their respective moves.
2014-06-10 23:24:25 -07:00
yenatch
fd6cfc73ee Text macros in text/. 2014-03-06 00:45:28 -05:00
yenatch
bf5807c53c String buffers in phone text. 2014-02-24 21:37:55 -05:00
yenatch
cf2acc1001 Use :: to export labels between objects.
This fixes the build.
2014-02-01 20:26:39 -05:00
yenatch
8bb8546497 buena text 2013-11-22 05:38:52 -05:00
yenatch
8018614585 split type strings and related asm out into text/types.asm 2013-09-07 23:24:22 -04:00
yenatch
4398dde8cb even more phone text (bank 5d) 2013-08-16 15:25:06 -04:00
yenatch
f458f96427 even more phone text (bank 29) 2013-08-16 14:43:35 -04:00
yenatch
caa7865ce7 extra phone text (bank 19) 2013-08-15 21:54:16 -04:00
yenatch
627914195d battle tower trainer text (bank 7b) 2013-08-15 06:09:12 -04:00
yenatch
03413c9f43 common text 2 and some fixes to compile 2013-07-28 17:16:51 -04:00
yenatch
3070aeb915 make way for bank 6f 2013-07-28 03:39:05 -04:00
yenatch
869de91bd5 LostBattle and HalveMoney 2013-06-17 18:19:45 -04:00
IIMarckus
620cf7a2a7 Disassemble Kris's PC. 2013-05-22 01:11:07 -06:00
IIMarckus
56d0175ad8 Add Prof. Oak's PC. 2013-05-21 17:03:31 -06:00
IIMarckus
5ac569e5f3 Add pointers to Oak speech text. 2013-05-12 16:55:25 -06:00
Sanky
b3d8c2ec49 Split battle text from main. 2013-05-12 12:38:49 +02:00
yenatch
59f6291afb Split common text out of main.asm 2013-02-17 02:19:49 -05:00