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 |
|
yenatch
|
2a08b8b7ce
|
Merge commit '963fe48' into merge-mrwint
|
2013-10-25 16:41:19 -04:00 |
|
yenatch
|
da22ada91c
|
Merge commit '546c17ad' into merge-mrwint
Conflicts:
engine/scripting.asm
main.asm
|
2013-10-25 16:23:16 -04:00 |
|
yenatch
|
7a13251d03
|
Merge commit '4ac6783' into merge-mrwint
|
2013-10-25 16:17:52 -04:00 |
|
yenatch
|
b8603ecb92
|
Merge commit 'ec77075a' into merge-mrwint
Conflicts:
main.asm
|
2013-10-25 16:04:31 -04:00 |
|
yenatch
|
e1cce1cfb9
|
fix padding in compressed intro graphics
|
2013-10-08 22:28:51 -04:00 |
|
yenatch
|
a0ba53e09d
|
stop hardcoding the return bank for _LoadMusicByte
|
2013-10-08 13:37:11 -04:00 |
|
yenatch
|
aae33da95b
|
fix LoadMusicByte naming scheme
|
2013-10-08 13:34:32 -04:00 |
|
yenatch
|
91b822ceb8
|
rename 'LoadMusic' to '_PlayMusic'
|
2013-10-08 13:26:05 -04:00 |
|
yenatch
|
789469c465
|
rename 'StartMusic' to 'PlayMusic'
|
2013-10-08 13:21:15 -04:00 |
|
yenatch
|
963fe4808b
|
rename 'LoadSFX' to '_PlaySFX'
|
2013-10-08 13:13:35 -04:00 |
|
yenatch
|
546c17ad37
|
rename 'StartSFX' to 'PlaySFX'
|
2013-10-08 13:10:36 -04:00 |
|
yenatch
|
ec77075a47
|
ContestMons
|
2013-10-08 12:44:45 -04:00 |
|
Mr Wint
|
dfa9adcaeb
|
* added index comments to pointer lists
* added map header wram addresses
* analyzed some assembly
|
2013-10-05 04:03:34 +02:00 |
|
Mr Wint
|
6ddd1d8b46
|
* fixed call and jump labels in home bank
* added some more assembly
|
2013-10-02 07:11:54 +02:00 |
|
Mr Wint
|
c666d1014a
|
* make jumps and calls use labels
|
2013-10-02 06:53:35 +02:00 |
|
Mr Wint
|
c5ff1606f0
|
* last callab/callba macros
|
2013-10-02 03:55:40 +02:00 |
|
Mr Wint
|
181840cf43
|
* even more callab/callba macros
|
2013-10-02 03:20:48 +02:00 |
|
Mr Wint
|
eb5a7afe2b
|
* more callab/callba macros
|
2013-10-02 02:47:54 +02:00 |
|
Mr Wint
|
fa673df4fa
|
* applied callab/callba macros where possible
* corrected some mislabeled jump addresses
|
2013-10-02 01:59:16 +02:00 |
|
Mr Wint
|
255135d187
|
* extracted and added a bunch of assembly
|
2013-10-01 23:23:21 +02:00 |
|
yenatch
|
eebf069839
|
missed some bit2 script commands
|
2013-10-01 01:01:43 -04:00 |
|
yenatch
|
f6a5d7b2f2
|
split pokedex flag handling into home/pokedex_flags.asm
|
2013-09-18 21:54:31 -04:00 |
|
yenatch
|
f958ba0e6d
|
recomment IsInArray
|
2013-09-18 21:48:04 -04:00 |
|
yenatch
|
c074231a07
|
move window asm into home/window.asm
|
2013-09-18 21:40:48 -04:00 |
|
yenatch
|
5a4e4bdb41
|
fix some farcalls in window asm
|
2013-09-18 21:39:14 -04:00 |
|
yenatch
|
5249fd9773
|
fix padding in .lz files for attack graphics
|
2013-09-18 21:31:40 -04:00 |
|
yenatch
|
663c523ac4
|
fix formatting in player pic asm
|
2013-09-18 21:10:25 -04:00 |
|
yenatch
|
48bab16ea4
|
move dratini special into event/dratini.asm
|
2013-09-18 21:04:16 -04:00 |
|
yenatch
|
7cef3b76de
|
move mon icons into menu/mon_icons.asm
|
2013-09-18 20:58:32 -04:00 |
|
yenatch
|
1e56e3e9af
|
more encounter functions
|
2013-09-18 20:50:42 -04:00 |
|
yenatch
|
ee47d6ed17
|
more mobile functions
|
2013-09-16 17:52:23 -04:00 |
|
yenatch
|
e770ae20b2
|
clean up a couple mobile function comments
nothing here is actually commented out
|
2013-09-16 17:42:19 -04:00 |
|
yenatch
|
237861b553
|
rename hall of fame labels
|
2013-09-16 17:42:11 -04:00 |
|
yenatch
|
9ae1cd6a1c
|
split title screen functions into engine/title.asm
|
2013-09-15 18:59:53 -04:00 |
|
yenatch
|
0ce5c4fe93
|
split the mobile adapter library into lib/mobile/
|
2013-09-15 18:58:37 -04:00 |
|
yenatch
|
013c6fc368
|
some time-dependent function
|
2013-09-15 18:17:02 -04:00 |
|
yenatch
|
3370a04d9e
|
split color asm and data into engine/color.asm
|
2013-09-15 18:02:02 -04:00 |
|
yenatch
|
c3cab23cda
|
dump a palette set at the end of bank 2
|
2013-09-15 17:29:53 -04:00 |
|
yenatch
|
dd473e565b
|
incbin some 0s back
|
2013-09-15 17:24:56 -04:00 |
|
yenatch
|
c738318dc0
|
move part of an incbin into predef/cgb.asm
|
2013-09-15 17:08:10 -04:00 |
|
yenatch
|
ab91f49e3b
|
remove some incbins in bank 2
|
2013-09-15 17:01:17 -04:00 |
|
yenatch
|
44fac4fd70
|
finish an old script pointer table
|
2013-09-12 05:37:53 -04:00 |
|
yenatch
|
e1c3fee926
|
change old .tx includes to .asm
these were forgotten about with the last preprocessor change.
this is required for object dependencies to be handled by make.
|
2013-09-11 01:16:33 -04:00 |
|
yenatch
|
84a9b3907b
|
rename common/ to home/
|
2013-09-09 22:44:48 -04:00 |
|
Bryan Bishop
|
33d7ef72fe
|
Merge branch 'yenatch/split-predefs-specials-stds' into fix-split-predefs-specials-stds
https://github.com/kanzure/pokecrystal/pull/198
|
2013-09-09 16:00:05 -05:00 |
|