aboutsummaryrefslogtreecommitdiffstats
path: root/common.asm (follow)
Commit message (Collapse)AuthorAgeFilesLines
* merge YamaArashi/pokeredBryan Bishop2012-01-241-17/+427
|\ | | | | | | | | hg-commit-id: a3767c66df56
| * fix comment typo about swiftYamaArashi2012-01-241-1/+1
| | | | | | | | | | hg-commit-id: 724dbad27df7
| * update 2 text namesYamaArashi2012-01-241-8/+8
| | | | | | | | | | hg-commit-id: e9ece8076f6d
| * more battle codeYamaArashi2012-01-241-9/+173
| | | | | | | | | | hg-commit-id: f31a255ecaf0
| * MergeYamaArashi2012-01-241-13/+57
| |\ | | | | | | | | | | | | hg-commit-id: d509fe34f171
| * | disasm more battle codeYamaArashi2012-01-241-2/+248
| | | | | | | | | | | | | | | hg-commit-id: 6f008f9e5c9d
* | | trainer headers for SilphCo6Bryan Bishop2012-01-241-11/+65
| |/ |/| | | | | | | hg-commit-id: fc8115c7d84f
* | insert a few more trainer headersBryan Bishop2012-01-241-5/+38
| | | | | | | | | | hg-commit-id: 1ca94c2e1fe8
* | TextEndBattle is only used onceBryan Bishop2012-01-241-2/+13
| | | | | | | | | | hg-commit-id: c038c49301fc
* | merge YamaArashi/pokeredBryan Bishop2012-01-231-52/+173
|\| | | | | | | | | hg-commit-id: 4a5294486028
| * fixed typoYamaArashi2012-01-231-1/+1
| | | | | | | | | | hg-commit-id: aade1ab573e4
| * disasm of some battle codeYamaArashi2012-01-231-11/+132
| | | | | | | | | | hg-commit-id: a650d8e5b82a
| * mergeYamaArashi2012-01-231-145/+369
| |\ | | | | | | | | | | | | hg-commit-id: 179864ca89bf
| * \ mergeYamaArashi2012-01-231-289/+289
| |\ \ | | | | | | | | | | | | | | | | hg-commit-id: ed3014e00c72
| * | | add missing labelsYamaArashi2012-01-231-3/+3
| | | | | | | | | | | | | | | | | | | | hg-commit-id: f6c8feae4f1f
| * | | changed some addresses to the new constantsYamaArashi2012-01-231-37/+37
| | | | | | | | | | | | | | | | | | | | hg-commit-id: bc038ee359b8
| * | | fix constantYamaArashi2012-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | hg-commit-id: 1a095dae2a66
* | | | another minor comment improvementBryan Bishop2012-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | hg-commit-id: bc6ea3b99e19
* | | | clean up more commentsBryan Bishop2012-01-231-6/+6
| |_|/ |/| | | | | | | | | | | hg-commit-id: b1f69c1d22a8
* | | more addresses on labelsBryan Bishop2012-01-231-24/+48
| | | | | | | | | | | | | | | hg-commit-id: 46469b1d8dcb
* | | label comments with addressesBryan Bishop2012-01-231-122/+322
| |/ |/| | | | | | | hg-commit-id: 985933b3044f
* | add addresses to label linesBryan Bishop2012-01-231-289/+289
|/ | | | | hg-commit-id: e96304c21bdb
* mergeDavid@DCKZHZF1.socal.rr.com2012-01-231-657/+510
|\ | | | | | | | | hg-commit-id: 0bd33b891f95
| * $039e -> HandleMidJumpBryan Bishop2012-01-231-1/+1
| | | | | | | | | | hg-commit-id: f18a7d446304
| * fix typo (.notCinnabarGyn\@)Bryan Bishop2012-01-231-2/+2
| | | | | | | | | | hg-commit-id: d3c7301798d8
| * fix music.asm includeBryan Bishop2012-01-231-1/+1
| | | | | | | | | | hg-commit-id: 67918d1ede0d
| * MergeKuroiIeWa5Da2012-01-231-240/+8
| |\ | | | | | | | | | | | | hg-commit-id: eecb568bd9b6
| | * updated changes in repoKuroiIeWa5Da2012-01-231-1079/+3750
| | | | | | | | | | | | | | | hg-commit-id: 313907c15826
| | * merge from iimarckusKuroiIeWa5Da2012-01-211-240/+8
| | |\ | | | | | | | | | | | | | | | | hg-commit-id: af64ce989c39
| | | * seperated music from common.asm, fixed some minor spelling errorsKuroiIeWa5Da2012-01-211-266/+8
| | | | | | | | | | | | | | | | | | | | hg-commit-id: 338a5af36008
| | | * kanzure mergeKuroiIeWa5Da2012-01-201-584/+608
| | | |\ | | | | | | | | | | | | | | | | | | | | hg-commit-id: 666ca4b94d7a
| | | * | Experimental change for actual music dataKuroiIeWa5Da2012-01-201-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | hg-commit-id: 57a01bf5d4f1
| * | | | minor cleanupBryan Bishop2012-01-231-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | hg-commit-id: 4db75a0bb6ee
| * | | | more labels near PrintTextsBryan Bishop2012-01-231-126/+132
| | | | | | | | | | | | | | | | | | | | | | | | | hg-commit-id: ef4a418bc4e3
| * | | | more labels near many PrintTextsBryan Bishop2012-01-221-284/+360
| | | | | | | | | | | | | | | | | | | | | | | | | hg-commit-id: 137a2f210334
* | | | | work on disasm of 2920David@DCKZHZF1.socal.rr.com2012-01-231-2/+233
|/ / / / | | | | | | | | | | | | | | | | hg-commit-id: af22b9d329bd
* | | | display start menu functionYamaArashi2012-01-221-1/+95
| | | | | | | | | | | | | | | | | | | | hg-commit-id: c786162e5d68
* | | | disasm of 39e-12daYamaArashi2012-01-221-1/+2411
| | | | | | | | | | | | | | | | | | | | hg-commit-id: fccdbeaf9091
* | | | replace references to map scripts with labelsBryan Bishop2012-01-221-24/+24
| | | | | | | | | | | | | | | | | | | | hg-commit-id: 48e55b01b33c
* | | | even more labels around PrintTextsBryan Bishop2012-01-221-40/+75
| | | | | | | | | | | | | | | | | | | | hg-commit-id: 037e2acc7eff
* | | | more labels near PrintTextsBryan Bishop2012-01-221-114/+146
| | | | | | | | | | | | | | | | | | | | hg-commit-id: 1f8265c70cc2
* | | | jp $24D7 -> jp TextScriptEndBryan Bishop2012-01-221-5/+5
| | | | | | | | | | | | | | | | | | | | hg-commit-id: 20b61588eaa7
* | | | fix PrintText-related labelsBryan Bishop2012-01-221-104/+118
| | | | | | | | | | | | | | | | | | | | hg-commit-id: df1ffaeafdfa
* | | | labels inside NameRaterText1 and BikeShop textsBryan Bishop2012-01-221-28/+28
| | | | | | | | | | | | | | | | | | | | hg-commit-id: 507b255471cb
* | | | fix labels in BikeShopText1Bryan Bishop2012-01-221-14/+16
| | | | | | | | | | | | | | | | | | | | hg-commit-id: 7870cbb1af58
* | | | improvements to OaksLab, labeling, etc.Bryan Bishop2012-01-221-106/+109
| | | | | | | | | | | | | | | | | | | | hg-commit-id: 66b0109d94d7
* | | | jp $24d7 -> jp TextScriptEndBryan Bishop2012-01-221-491/+491
| | | | | | | | | | | | | | | | | | | | hg-commit-id: 381d79318d0c
* | | | improvements to choose mon text in OaksLabBryan Bishop2012-01-221-71/+76
| | | | | | | | | | | | | | | | | | | | hg-commit-id: c2b4d54abc07
* | | | fix TX_FAR mistaken for asmBryan Bishop2012-01-221-7/+8
| | | | | | | | | | | | | | | | | | | | hg-commit-id: a572ddb3219c
* | | | add some labels around PrintText callsBryan Bishop2012-01-221-18/+18
| | | | | | | | | | | | | | | | | | | | hg-commit-id: be7e81581365