dannye
|
269f2c3ba7
|
Sync with pokered
from August 29, 2015 to April 6, 2016
|
2016-06-11 15:45:24 -05:00 |
|
luckytyphlosion
|
d271cc7b08
|
engine/in_game_trades.asm
|
2015-09-04 14:50:37 -04:00 |
|
U-Daniel-PC\Daniel
|
8f2edd9c41
|
Build only Yellow
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
|
2015-08-01 17:32:39 -04:00 |
|
IIMarckus
|
a3d3f8324a
|
Kill version.asm.
|
2014-10-17 02:42:32 -06:00 |
|
IIMarckus
|
6e14461fa6
|
Add a lot of Yellow text changes.
|
2014-10-10 01:46:06 -06:00 |
|
U-Fish-PC\Daniel
|
1e86625c87
|
Pull most data out of main.asm
|
2014-05-16 19:50:38 -04:00 |
|