aboutsummaryrefslogtreecommitdiffstats
path: root/common.asm (follow)
Commit message (Expand)AuthorAgeFilesLines
* merge YamaArashi/pokeredBryan Bishop2012-01-241-17/+427
|\
| * fix comment typo about swiftYamaArashi2012-01-241-1/+1
| * update 2 text namesYamaArashi2012-01-241-8/+8
| * more battle codeYamaArashi2012-01-241-9/+173
| * MergeYamaArashi2012-01-241-13/+57
| |\
| * | disasm more battle codeYamaArashi2012-01-241-2/+248
* | | trainer headers for SilphCo6Bryan Bishop2012-01-241-11/+65
| |/ |/|
* | insert a few more trainer headersBryan Bishop2012-01-241-5/+38
* | TextEndBattle is only used onceBryan Bishop2012-01-241-2/+13
* | merge YamaArashi/pokeredBryan Bishop2012-01-231-52/+173
|\|
| * fixed typoYamaArashi2012-01-231-1/+1
| * disasm of some battle codeYamaArashi2012-01-231-11/+132
| * mergeYamaArashi2012-01-231-145/+369
| |\
| * \ mergeYamaArashi2012-01-231-289/+289
| |\ \
| * | | add missing labelsYamaArashi2012-01-231-3/+3
| * | | changed some addresses to the new constantsYamaArashi2012-01-231-37/+37
| * | | fix constantYamaArashi2012-01-231-1/+1
* | | | another minor comment improvementBryan Bishop2012-01-231-1/+1
* | | | clean up more commentsBryan Bishop2012-01-231-6/+6
| |_|/ |/| |
* | | more addresses on labelsBryan Bishop2012-01-231-24/+48
* | | label comments with addressesBryan Bishop2012-01-231-122/+322
| |/ |/|
* | add addresses to label linesBryan Bishop2012-01-231-289/+289
|/
* mergeDavid@DCKZHZF1.socal.rr.com2012-01-231-657/+510
|\
| * $039e -> HandleMidJumpBryan Bishop2012-01-231-1/+1
| * fix typo (.notCinnabarGyn\@)Bryan Bishop2012-01-231-2/+2
| * fix music.asm includeBryan Bishop2012-01-231-1/+1
| * MergeKuroiIeWa5Da2012-01-231-240/+8
| |\
| | * updated changes in repoKuroiIeWa5Da2012-01-231-1079/+3750
| | * merge from iimarckusKuroiIeWa5Da2012-01-211-240/+8
| | |\
| | | * seperated music from common.asm, fixed some minor spelling errorsKuroiIeWa5Da2012-01-211-266/+8
| | | * kanzure mergeKuroiIeWa5Da2012-01-201-584/+608
| | | |\
| | | * | Experimental change for actual music dataKuroiIeWa5Da2012-01-201-2/+28
| * | | | minor cleanupBryan Bishop2012-01-231-4/+7
| * | | | more labels near PrintTextsBryan Bishop2012-01-231-126/+132
| * | | | more labels near many PrintTextsBryan Bishop2012-01-221-284/+360
* | | | | work on disasm of 2920David@DCKZHZF1.socal.rr.com2012-01-231-2/+233
|/ / / /
* | | | display start menu functionYamaArashi2012-01-221-1/+95
* | | | disasm of 39e-12daYamaArashi2012-01-221-1/+2411
* | | | replace references to map scripts with labelsBryan Bishop2012-01-221-24/+24
* | | | even more labels around PrintTextsBryan Bishop2012-01-221-40/+75
* | | | more labels near PrintTextsBryan Bishop2012-01-221-114/+146
* | | | jp $24D7 -> jp TextScriptEndBryan Bishop2012-01-221-5/+5
* | | | fix PrintText-related labelsBryan Bishop2012-01-221-104/+118
* | | | labels inside NameRaterText1 and BikeShop textsBryan Bishop2012-01-221-28/+28
* | | | fix labels in BikeShopText1Bryan Bishop2012-01-221-14/+16
* | | | improvements to OaksLab, labeling, etc.Bryan Bishop2012-01-221-106/+109
* | | | jp $24d7 -> jp TextScriptEndBryan Bishop2012-01-221-491/+491
* | | | improvements to choose mon text in OaksLabBryan Bishop2012-01-221-71/+76
* | | | fix TX_FAR mistaken for asmBryan Bishop2012-01-221-7/+8
* | | | add some labels around PrintText callsBryan Bishop2012-01-221-18/+18