Commit Graph

4014 Commits

Author SHA1 Message Date
PikalaxALT
5eed48f05d Some battle labels 2015-11-05 19:13:09 -05:00
PikalaxALT
1205fe5100 PLAYEREVENT_ 2015-11-05 15:08:00 -05:00
PikalaxALT
adf2fe712d Various labels 2015-11-05 14:06:03 -05:00
PikalaxALT
893b3a217e Restore compare.sh with new version as compare2.sh 2015-11-04 20:29:11 -05:00
PikalaxALT
3cadc7b012 give/takeitem *, 1: the 1 is optional 2015-11-04 20:20:14 -05:00
PikalaxALT
7fd20e6322 home/copy.asm completely labeled 2015-11-04 16:14:27 -05:00
PikalaxALT
95cb4636af Corrected some mislabeled 1bpps 2015-11-04 15:35:29 -05:00
PikalaxALT
cf5d726b7f Mon submenu, engine/menu.asm 2015-11-04 14:02:11 -05:00
PikalaxALT
94c720832a Additional pass for dba 2015-11-04 11:45:30 -05:00
PikalaxALT
739bb3c136 Replace party struct relative values with EQUS constants 2015-11-04 11:31:00 -05:00
PikalaxALT
14e0da5116 Status screen edits 2015-11-04 08:43:46 -05:00
PikalaxALT
d346664b14 Split up mobile_45.asm by bank 2015-11-04 07:35:41 -05:00
PikalaxALT
faa2d8f26e Reorganize BTTrainerClassGenders 2015-11-04 07:26:27 -05:00
PikalaxALT
451dad420e Battle Tower text function and pointers 2015-11-03 23:34:06 -05:00
PikalaxALT
f58756cafc A more verbose compare.sh 2015-11-03 22:54:19 -05:00
PikalaxALT
91ea4a2f9b Battle Tower trainer text 2015-11-03 22:35:36 -05:00
PikalaxALT
c5527a02ae dbw BANK, addr replaced with dba 2015-11-03 19:43:47 -05:00
PikalaxALT
10beeb3c06 Battle Tower 2015-11-03 15:22:04 -05:00
PikalaxALT
b1dc88b728 Experience and level calculations 2015-11-03 12:36:33 -05:00
PikalaxALT
40eae001a1 Status strings 2015-11-03 09:45:25 -05:00
PikalaxALT
4a16bbe45a sprite_header and emote_header 2015-11-03 09:16:56 -05:00
yenatch
1c1fe276ca Merge pull request #324 from PikalaxALT/master
Movement and map objects
2015-11-03 07:56:05 -05:00
PikalaxALT
2faa4a0f70 Fix errors in global substitution 2015-11-03 07:11:32 -05:00
PikalaxALT
0f37a42ad4 Mart constants 2015-11-02 17:38:08 -05:00
PikalaxALT
d495087026 Removed \2\@ from map_header_2 2015-11-02 15:06:09 -05:00
PikalaxALT
72af3337fd No more NONE 2015-11-02 14:37:02 -05:00
PikalaxALT
e0d6e9ca7a Fix NorthMapObjectIndexBuffer etc 2015-11-02 12:54:27 -05:00
PikalaxALT
d35cfad0de object_struct 2015-11-02 11:15:32 -05:00
PikalaxALT
76e2ea534f Object masks 2015-11-01 21:17:46 -05:00
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
IIMarckus
25c126c69b Revert bad merge.
"Merge pull request #317 from yenatch/pngs-kind-of"

This reverts commit 25025d1b6c, reversing
changes made to 0d17d4a758.
2015-11-01 16:06:15 -07:00
PikalaxALT
31c407bb3d Buena local labels 2015-11-01 12:44:30 -05:00
PikalaxALT
3b4805ee98 Sweepthrough of ClearBox arg conversion to lb 2015-11-01 09:38:48 -05:00
PikalaxALT
fda1f7c01a SPRITEMOVEDATA 2015-10-31 21:05:02 -04:00
PikalaxALT
8153737bae Enumerate text constants 2015-10-30 10:34:35 -04:00
PikalaxALT
ed29db5841 No more -bash000; engine/movement.asm, SPRITEMOVEFN 2015-10-29 23:32:11 -04:00
yenatch
006d14640c Merge pull request #319 from JimB16/master
Added comments and changed labels (mainly for AI- and Battle-Functions)
2015-10-27 14:30:22 -04:00
yenatch
25025d1b6c Merge pull request #317 from yenatch/pngs-kind-of
Pokemon and trainer pngs
2015-10-26 11:02:26 -04:00
yenatch
c21b6fb285 Commit the overworld sprite pngs. 2015-10-26 10:59:45 -04:00
yenatch
e638cdb74c Merge remote-tracking branch 'origin/master' into pngs-kind-of
Conflicts:
	INSTALL.md
2015-10-26 01:34:08 -04:00
JimB16
9a9cb38e39 merge with newest update 2015-10-26 03:26:53 +01:00
yenatch
0d17d4a758 Merge pull request #322 from PikalaxALT/master
Split out and comment phone and animation code.
2015-10-25 20:48:44 -04:00
PikalaxALT
79ceca591b ITEMMENU_CLOSE is now ITEMMENU_FIELD 2015-10-25 20:43:39 -04:00
PikalaxALT
247a31c298 RIP ITEMCONTEXT constants 2015-10-25 18:47:27 -04:00
PikalaxALT
5b825653ad The jumb is too damn high! 2015-10-25 11:44:35 -04:00
yenatch
6fcba7a28a simpler mac instructions 2015-10-25 03:26:12 -04:00
yenatch
5a4da53dfd fix repository links 2015-10-25 03:23:33 -04:00
PikalaxALT
4d17f6e1f6 Address comments on PR 322 2015-10-24 19:49:19 -04:00
PikalaxALT
69ee070021 Merge branch 'master' of https://github.com/pret/pokecrystal 2015-10-24 10:40:07 -04:00