aboutsummaryrefslogtreecommitdiffstats
path: root/text (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Remove more address commentsdannye2016-06-121-1/+1
|/ /
* | remove address commentsYamaArashi2016-06-1113-67/+67
| |
* | More syncing with pokereddannye2016-06-1115-39/+30
| | | | | | | | from April 8, 2016 to present
* | Merge branch 'master' of https://github.com/pret/pokeyellowdannye2016-06-11192-205/+3
|\ \
| * | Part 1 of syncing with pokered.IIMarckus2016-06-08192-206/+4
| | |
* | | Sync with pokereddannye2016-06-114-6/+6
|/ / | | | | | | from August 29, 2015 to April 6, 2016
* | Remove unused source filesdannye2016-06-061-27/+0
| |
* | Pikachu pics; town map entriespikalaxalt2016-06-041-1/+1
| |
* | Remaining maps in bank 1D (and the whole ROM)pikalaxalt2016-06-032-2/+2
| |
* | Text macros; Prize Roompikalaxalt2016-06-011-3/+3
| |
* | First four Celadon Mansion mapspikalaxalt2016-05-311-1/+1
| |
* | Vermilion Fan Clubpikalaxalt2016-05-311-4/+4
| |
* | Cerulean Bike Shoppikalaxalt2016-05-301-1/+1
| |
* | Museum 1F far text scriptspikalaxalt2016-05-291-1/+1
| |
* | Oaks Lab rewrite part 4pikalaxalt2016-05-281-40/+40
| |
* | Redo credits constantspikalaxalt2016-05-271-172/+172
| |
* | Credits. Can I add my own name? Kappapikalaxalt2016-05-271-134/+204
| |
* | Vermilion City scriptspikalaxalt2016-05-271-9/+9
| |
* | Route 25 scriptspikalaxalt2016-05-271-3/+2
| |
* | Route 24 scriptspikalaxalt2016-05-272-28/+28
| |
* | Final phase 3 of Viridian City script disassemblypikalaxalt2016-05-261-1/+1
| |
* | Merge branch 'master' of github.com:pret/pokeyellowpikalaxalt2016-05-222-119/+118
|\ \
| * | Bank11 and 14 misc functions.luckytyphlosion2016-05-222-119/+118
| | |
* | | Replace MonsterNames dr with file already in repopikalaxalt2016-05-221-1/+1
|/ /
* | Split bank1 up.luckytyphlosion2016-03-171-0/+20
| |
* | engine/battle/trainer_ai.asmluckytyphlosion2015-12-061-1/+1
| |
* | Bank9 misc. functionsluckytyphlosion2015-11-281-1/+1
| | | | | | | | PrintMonType and SaveTrainerName
* | 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
|