aboutsummaryrefslogtreecommitdiffstats
path: root/text (follow)
Commit message (Collapse)AuthorAgeFilesLines
* overworld item & movement code, cable club code, remove more instances of ↵luckytyphlosion2015-10-291-1/+1
| | | | | | W_, add PIKAHAPPY_TRADE Also make replace.sh take args
* Revert "Revert "data/facing.asm, titlescreen functions, oam/sprite related ↵luckytyphlosion2015-10-261-1/+1
| | | | | | functions, other misc functions"" This reverts commit c8ddbe7566120d74a5078d5a9031a6c5befde00d.
* Revert "data/facing.asm, titlescreen functions, oam/sprite related ↵luckytyphlosion2015-10-251-1/+1
| | | | | | functions, other misc functions" This reverts commit 3a5d7ec05db9ce1156863983a0427396d6f6f49b.
* data/facing.asm, titlescreen functions, oam/sprite related functions, other ↵luckytyphlosion2015-10-241-1/+1
| | | | | | misc functions Also rename pcm-related functions.
* Make pokeyellow build correctly.luckytyphlosion2015-09-031-1/+1
|
* Merge branch 'master' of https://github.com/iimarckus/pokeredluckytyphlosion2015-08-307-55/+62
|\ | | | | | | Doesn't build.
| * More joypad constantsdannye2015-08-111-2/+2
| |
| * named CountSetBits output variableYamaArashi2015-08-071-2/+2
| |
| * more naming variablesYamaArashi2015-07-241-1/+1
| |
| * clean up wram aliasesYamaArashi2015-07-231-1/+1
| |
| * miscYamaArashi2015-07-182-18/+16
| |
| * Name the last of unnamed textU-Daniel-PC\Daniel2015-06-126-13/+13
| |
* | Remove (incorrect) address commentsU-Daniel-PC\Daniel2015-08-01196-1793/+1793
| | | | | | | | | | Conflicts: text.asm
* | Build only YellowU-Daniel-PC\Daniel2015-08-0153-393/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gfx/intro_nido_1.6x6.png gfx/intro_nido_2.6x6.png gfx/intro_nido_3.6x6.png gfx/redgreenversion.png text.asm text/maps/cerulean_trade_house.asm text/maps/copycats_house_1f.asm text/maps/daycare_2.asm text/maps/museum_2f.asm text/maps/oaks_lab.asm text/maps/pewter_gym.asm text/maps/route_9_1.asm text/maps/school.asm text/maps/vermilion_gym_1.asm yellow/main.asm
* | text.oU-Daniel-PC\Daniel2015-08-0150-2042/+1868
|/ | | | | | | | | | | | | | | | | Conflicts: main.asm text.asm text/maps/cerulean_trade_house.asm text/maps/copycats_house_1f.asm text/maps/daycare_2.asm text/maps/museum_2f.asm text/maps/oaks_lab.asm text/maps/pewter_gym.asm text/maps/route_9_1.asm text/maps/school.asm text/maps/vermilion_gym_1.asm wram.asm yellow/text.asm
* Clean up type names.yenatch2014-12-101-60/+47
|
* Fix unclosed quotes.stag0192014-11-041-1/+1
|
* Labels for Fuji in Pokémon Tower.IIMarckus2014-10-261-1/+1
|
* Add more text changes from Yellow.IIMarckus2014-10-2417-3/+315
|
* Add parts of the Safari Zone entrance script from Yellow.IIMarckus2014-10-171-0/+46
|
* Add more from the beach house.IIMarckus2014-10-171-16/+20
|
* Kill version.asm.IIMarckus2014-10-171-2/+2
|
* Fix typo in previous.IIMarckus2014-10-101-1/+1
|
* Add a lot of Yellow text changes.IIMarckus2014-10-1043-11/+749
|
* Add macro TX_BCD for printing BCD numbers.yenatch2014-05-271-1/+1
| | | | This fixes some more static wram addresses.
* Remove most static wram addresses. Use labels instead.yenatch2014-05-2632-49/+49
| | | | | | For unknown addresses, use "w<address>". Label overleads are still an issue.
* Misc relabellingU-Fish-PC\Daniel2014-05-211-1/+1
|
* Merge branch 'master' of https://github.com/huderlem/pokered into pull-dataU-Fish-PC\Daniel2014-05-191-7/+7
|\ | | | | | | | | | | | | Conflicts: main.asm text.asm text/maps/route_22.asm
| * Documented/Labeled Route 22 scripts.Marcus Huderle2014-05-131-7/+7
| |
* | Pull more data out of main.asmU-Fish-PC\Daniel2014-05-192-0/+260
| |
* | Pull map scripts out of main.asmU-Fish-PC\Daniel2014-05-1885-494/+494
| |
* | Pull most data out of main.asmU-Fish-PC\Daniel2014-05-164-0/+444
|/
* Add labels and comments to the Fan Club.IIMarckus2014-04-211-13/+13
|
* Improve comments/labels for Silph Co 7F.IIMarckus2014-04-191-10/+10
|
* Label a Route 11 gatehouse script better.IIMarckus2014-04-191-2/+2
|
* Use dimension constants in warp data and add map name consisntencyU-Fish-PC\Daniel2014-04-056-17/+17
|
* Get rid of globals.asm. Use ::s to export labels between objects.yenatch2014-01-27212-2128/+2128
| | | | | | | | | | | globals.asm was a hack that: - gave rgbasm an extra 100k lines to read - increased reliance on the python preprocessor - made the makefile a mess - gave object creation an extra step - wasn't even necessary This speeds up build time by at least a third.
* Split out move namesyenatch2014-01-231-0/+167
|
* Split out the rest of map textyenatch2014-01-2327-0/+844
|
* Split out route textyenatch2014-01-2327-0/+2891
|
* Even more map textyenatch2014-01-2283-0/+4373
|
* Silph Co 1f text was actually somewhere elseyenatch2014-01-221-0/+6
|
* Move city and town map text into text/mapsyenatch2014-01-229-0/+1187
|
* split out a bunch of map textyenatch2014-01-2261-0/+3085
|
* split viridian and oaks lab text into text/maps/yenatch2014-01-227-0/+956
|
* rename existing map text files and put them in text/maps/yenatch2014-01-223-0/+0
|
* text macros in pokedex entriesyenatch2014-01-221-906/+1209
|
* rename and add some text macrosyenatch2014-01-224-45/+45
| | | | | | cont replaces next, and next becomes a generic newline. para replaces page (now used for pokedex entries). dex ends a pokedex entry.
* text macros in text/yenatch2014-01-214-104/+144
|
* Split large chunks of text into separate files, and improve Makefile.IIMarckus2011-12-264-0/+152
| | | | | hg-commit-id: 59e6e303019d