aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Actually commit with vending_machine.asm includedluckytyphlosion2016-05-301-2/+2
* Vending machineluckytyphlosion2016-05-301-15/+17
* Merge pull request #9 from PikalaxALT/masterluckytyphlosion2016-05-30191-8831/+13693
|\
| * Digletts Cave Route 11 Entrancepikalaxalt2016-05-303-3/+9
| * Power Plantpikalaxalt2016-05-303-3/+8
| * Rock Tunnel 1pikalaxalt2016-05-303-3/+11
| * Rock Tunnel Pokecenterpikalaxalt2016-05-307-10/+21
| * Add missing file; route 7/8 gates and route 8 path entrancepikalaxalt2016-05-307-11/+99
| * Route 7 underground path entrancepikalaxalt2016-05-303-5/+15
| * Route 6 underground entrancepikalaxalt2016-05-303-5/+10
| * Route 6 gatepikalaxalt2016-05-303-3/+9
| * Daycarepikalaxalt2016-05-304-4/+41
| * Route 5 Underground Path Gatepikalaxalt2016-05-303-4/+9
| * Route 5 gatepikalaxalt2016-05-303-3/+10
| * Mt Moon Pokemon Centerpikalaxalt2016-05-3010-107/+159
| * Cerulean Martpikalaxalt2016-05-303-6/+9
| * Cerulean Bike Shoppikalaxalt2016-05-305-13/+24
| * Guys we need to disassemble Mistypikalaxalt2016-05-304-4/+11
| * Cerulean Pokemon Center; Func_5c0d4; space after comma in engine/menu/pokedex...pikalaxalt2016-05-309-273/+292
| * A couple more map-specific Pikachu functions in Bank 3Cpikalaxalt2016-05-301-1/+131
| * Bulbasaur house in Ceruleanpikalaxalt2016-05-297-32/+123
| * Trashed cerulean housepikalaxalt2016-05-293-5/+8
| * Accessory function for Mt Moon B2Fpikalaxalt2016-05-291-1/+29
| * Mt Moon B2Fpikalaxalt2016-05-299-176/+485
| * Mt Moon B2Fpikalaxalt2016-05-293-3/+11
| * Mt Moon B1Fpikalaxalt2016-05-294-15/+17
| * Pewter Pokecenterpikalaxalt2016-05-2918-94/+63
| * Pewter houses, Pewter martpikalaxalt2016-05-294-11/+31
| * Pewter Gym and Museum 2Fpikalaxalt2016-05-295-11/+69
| * Museum 1F local scriptspikalaxalt2016-05-294-196/+22
| * Museum 1F far text scriptspikalaxalt2016-05-293-2/+214
| * Another chunk of bank 3cpikalaxalt2016-05-2915-358/+551
| * More Bill's House text scriptspikalaxalt2016-05-291-1/+53
| * More far text scriptspikalaxalt2016-05-294-3/+69
| * Viridian Forest and other functionspikalaxalt2016-05-2912-196/+426
| * Various interior maps on route 2pikalaxalt2016-05-285-17/+51
| * Viridian Gympikalaxalt2016-05-283-3/+9
| * Viridian housepikalaxalt2016-05-283-4/+8
| * Viridian Trainer Schoolpikalaxalt2016-05-286-9/+30
| * Viridian Martpikalaxalt2016-05-2814-14/+60
| * Viridian pokecenterpikalaxalt2016-05-2816-20/+41
| * Oaks Lab rewrite part 5 (finish)pikalaxalt2016-05-282-16/+86
| * Oaks Lab rewrite part 4pikalaxalt2016-05-283-46/+422
| * Oak's Lab Rewrite part 3pikalaxalt2016-05-284-13/+240
| * Oak's Lab Rewrite part 2pikalaxalt2016-05-281-7/+182
| * Oak's Lab Rewrite part 1pikalaxalt2016-05-284-1053/+142
| * Blue's Housepikalaxalt2016-05-276-28/+33
| * Red's House 2Fpikalaxalt2016-05-272-13/+19
| * Red's House 1Fpikalaxalt2016-05-274-60/+73
| * Route 8; all outdoor maps completedpikalaxalt2016-05-274-6/+7