diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-08 01:52:50 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 17:16:11 -0400 |
| commit | 10af88ddd712415f2a0a2b6124187d51075c95d5 (patch) | |
| tree | 0fe1145438b5cc645f95fe190b9f418cf73dedc7 /main.asm | |
| parent | Attempt to make Yellow buildable, part 2. (diff) | |
| download | pokeyellow-10af88ddd712415f2a0a2b6124187d51075c95d5.tar.gz pokeyellow-10af88ddd712415f2a0a2b6124187d51075c95d5.tar.xz pokeyellow-10af88ddd712415f2a0a2b6124187d51075c95d5.zip | |
text.o
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
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -6148,6 +6148,7 @@ INCLUDE "scripts/pokemontower7.asm" INCLUDE "data/mapObjects/pokemontower7.asm" PokemonTower7Blocks: INCBIN "maps/pokemontower7.blk" +<<<<<<< HEAD INCLUDE "data/mapHeaders/celadonmart1.asm" INCLUDE "scripts/celadonmart1.asm" INCLUDE "data/mapObjects/celadonmart1.asm" @@ -6281,7 +6282,6 @@ Facility_Block: INCBIN "gfx/blocksets/facility.bst" SECTION "bank1B",ROMX,BANK[$1B] - Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.t4.2bpp" Cemetery_Block: INCBIN "gfx/blocksets/cemetery.bst" Cavern_GFX: INCBIN "gfx/tilesets/cavern.t14.2bpp" |