Commit Graph

2397 Commits

Author SHA1 Message Date
yenatch
f16193dc91 move more credits asm into engine/credits.asm 2013-11-24 04:26:10 -05:00
yenatch
25325139e6 more credits labels and theend graphic 2013-11-24 04:09:17 -05:00
yenatch
b47f460061 lb macro for fast double-register loads 2013-11-24 04:06:37 -05:00
yenatch
b4968a9ab7 forgot the new pokecrystal.asm 2013-11-23 14:49:37 -05:00
Bryan Bishop
112de1c172 Merge pull request #216 from yenatch/master
1bpp handling
2013-11-23 00:39:48 -08:00
yenatch
bb68a76330 Makefile: more readable object list 2013-11-23 02:54:02 -05:00
yenatch
cf6295cb9f objects for event handling and scripting 2013-11-23 02:51:48 -05:00
yenatch
29afa24f0b split more event handling out of main 2013-11-23 02:33:53 -05:00
yenatch
8bb8546497 buena text 2013-11-22 05:38:52 -05:00
yenatch
0ccfccf4bf move map groups into maps/map_headers.asm 2013-11-22 05:05:25 -05:00
yenatch
bd392da29e split event handling into engine/events.asm 2013-11-22 05:04:32 -05:00
yenatch
bcd833e758 version checks for event script commands and move in related asm 2013-11-22 04:51:47 -05:00
yenatch
94188ee0f7 version-sensitive objects for egg moves and evos/attacks
this way main.o and wram.o are version-neutral
2013-11-22 00:14:55 -05:00
yenatch
02e8b4c7b6 version-neutral build targets
pokecrystal will probably never build gold/silver, but who knows
2013-11-21 21:15:37 -05:00
yenatch
f6706ecb09 finally compile multiple objects
pokecrystal.asm doesnt really make sense now so its gone

add includes.asm so objects have a standard include set
2013-11-20 06:35:10 -05:00
yenatch
34aac15db0 generated mapfile and symfile in gitignore 2013-11-20 04:11:17 -05:00
yenatch
549591ab0e convert pngs to 1bpp too 2013-11-18 21:07:07 -05:00
yenatch
9af74f1efa bump pokemontools for 1bpp 2013-11-18 21:07:04 -05:00
yenatch
a082f314b3 evolution animation 2013-11-18 20:48:00 -05:00
Bryan Bishop
74afd6d680 Merge pull request #215 from yenatch/master
dump the music again
2013-11-14 12:02:49 -08:00
Bryan Bishop
cd3bb21502 Merge pull request #214 from kanzure/battle-menu-stuff
Battle menu labels
2013-11-11 23:48:19 -08:00
Bryan Bishop
40ed4545b2 local labels for some mobile link battles 2013-11-12 01:39:41 -06:00
Bryan Bishop
2ee4938987 fix typo in PartyMenuSelect comment 2013-11-12 01:05:54 -06:00
Bryan Bishop
02d001a1f4 label CheckInMobileLinkBattle 2013-11-12 01:05:21 -06:00
Bryan Bishop
a99a205b28 labels for some battle menus 2013-11-12 00:29:26 -06:00
yenatch
42a0396b6a get rid of external song labels 2013-11-07 01:18:58 -05:00
yenatch
8627d1760e dump the music again 2013-11-07 01:18:50 -05:00
yenatch
2143b5479e import some new sound classes from pokemontools 2013-11-07 01:15:20 -05:00
yenatch
6271b61982 bump pokemontools feat sound dumps 2013-11-07 01:13:51 -05:00
yenatch
fa3145dd44 rework note macro 2013-11-07 01:11:42 -05:00
yenatch
76d8ed2264 split sfx constants out of music constants 2013-11-07 01:10:43 -05:00
yenatch
6a641b438a get rid of unused sound constants 2013-11-07 01:06:37 -05:00
yenatch
6f1928eaea stack music command labels 2013-11-05 15:19:12 -05:00
yenatch
12f0be8ccc recomment ReadNoiseSample 2013-11-05 15:04:26 -05:00
yenatch
b2dd26c8a0 rename ParseCommand to ParseMusicCommand 2013-11-05 14:40:55 -05:00
Bryan Bishop
07612257cc Merge pull request #213 from yenatch/merge-mrwint
Merge mrwint/master into kanzure/master
2013-10-25 16:01:12 -07:00
yenatch
046192575e Merge branch 'master' into merge-mrwint 2013-10-25 18:10:42 -04:00
yenatch
86cdb9e013 Merge commit 'cf966bb8' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 18:02:17 -04:00
yenatch
193dbd53a6 Merge commit '0ead58cd' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 17:57:27 -04:00
yenatch
52a6b7da8e Merge commit '946a213f' into merge-mrwint 2013-10-25 17:54:04 -04:00
yenatch
9e81c46cbf Merge commit '66ef1838' into merge-mrwint
Conflicts:
	home/map.asm
2013-10-25 17:53:16 -04:00
yenatch
933634d913 Merge commit 'da689fa7' into merge-mrwint 2013-10-25 17:45:25 -04:00
yenatch
9d02e1063f Merge commit '8b8de40' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 17:44:50 -04:00
yenatch
6ea15c444e Merge commit '650dc98b' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 17:34:45 -04:00
yenatch
a41b870dfa Merge commit '754325b2' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 17:21:20 -04:00
yenatch
15a6bd55f4 Merge commit 'e1cce1c' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 17:06:19 -04:00
yenatch
32ede188d7 Merge commit 'a0ba53e' into merge-mrwint 2013-10-25 16:55:58 -04:00
yenatch
2ca81c9d73 Merge commit 'aae33da9' into merge-mrwint 2013-10-25 16:55:41 -04:00
yenatch
4fcabdc07b Merge commit '91b822c' into merge-mrwint 2013-10-25 16:51:24 -04:00
yenatch
bd49428c4a Merge commit '789469c' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 16:48:29 -04:00