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 |
|
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 |
|
Bryan Bishop
|
80329c5489
|
Merge pull request #210 from yenatch/master
contest mons, fixed dumb labels, fixed more lz dumps, game freak logo, roofs
|
2013-10-14 11:53:12 -07:00 |
|
yenatch
|
cf966bb824
|
rename tilemap coordinate functions
|
2013-10-13 02:26:42 -04:00 |
|
yenatch
|
0ead58cdaa
|
fix labels for and rename GetBattleVarPair to GetBattleVar
|
2013-10-11 03:04:21 -04:00 |
|
yenatch
|
946a213f09
|
fix labels for SoundRestart and UpdateSound
|
2013-10-11 02:55:01 -04:00 |
|
yenatch
|
66ef183847
|
relabel LoadMapGroupRoof
|
2013-10-11 02:31:51 -04:00 |
|
yenatch
|
da689fa7d6
|
roof graphics
|
2013-10-11 01:43:15 -04:00 |
|
yenatch
|
8b8de40525
|
roofs for each map group
|
2013-10-11 01:36:11 -04:00 |
|
yenatch
|
650dc98be4
|
game freak logo
|
2013-10-10 03:12:02 -04:00 |
|
yenatch
|
754325b270
|
use the IntroLogoGFX label in existing asm
|
2013-10-10 03:02:14 -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
|
4ac678313f
|
rename 'PlaySFX' to 'PlayStereoSFX'
|
2013-10-08 13:05:52 -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 |
|
Bryan Bishop
|
94d4c89e09
|
Merge pull request #209 from yenatch/script-commands
use updated script commands from pokemontools
|
2013-09-30 23:17:04 -07:00 |
|
yenatch
|
d31dbfc780
|
bump extras to use updated script commands
|
2013-10-01 01:19:36 -04:00 |
|
yenatch
|
cf359b09fc
|
fix parsing errors for displaylocation
|
2013-10-01 01:13:21 -04:00 |
|
yenatch
|
4cdc51d159
|
fix parameter comments for updated script commands
|
2013-10-01 01:13:04 -04:00 |
|