diff --git a/data/tilesets/nihon_birdon_attributes.bin b/data/tilesets/nihon_birdon_attributes.bin index 216b460..d8a85fd 100644 Binary files a/data/tilesets/nihon_birdon_attributes.bin and b/data/tilesets/nihon_birdon_attributes.bin differ diff --git a/data/tilesets/nihon_birdon_metatiles.bin b/data/tilesets/nihon_birdon_metatiles.bin index aa9a29b..f40b850 100644 Binary files a/data/tilesets/nihon_birdon_metatiles.bin and b/data/tilesets/nihon_birdon_metatiles.bin differ diff --git a/gfx/tilesets/desert.pal b/gfx/tilesets/desert.pal new file mode 100644 index 0000000..52cc4d5 --- /dev/null +++ b/gfx/tilesets/desert.pal @@ -0,0 +1,30 @@ +DesertMornPalette: + RGB 31,31,16, 23,21,20, 14,13,12, 07,07,07 ; gray + RGB 31,31,16, 31,19,24, 30,10,06, 07,07,07 ; red + RGB 31,31,16, 14,27,01, 08,16,01, 07,07,07 ; green + RGB 23,23,31, 18,19,31, 13,12,31, 07,07,07 ; water + RGB 31,31,16, 31,31,07, 31,16,01, 07,07,07 ; yellow + RGB 31,31,16, 26,19,07, 20,14,03, 07,07,07 ; brown + RGB 31,31,16, 15,31,31, 05,17,31, 07,07,07 ; roof + RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text + +DesertDayPalette: + RGB 31,31,27, 23,21,20, 14,13,12, 07,07,07 ; gray + RGB 31,31,27, 31,19,24, 30,10,06, 07,07,07 ; red + RGB 31,31,27, 14,27,01, 08,16,01, 07,07,07 ; green + RGB 23,23,31, 18,19,31, 13,12,31, 07,07,07 ; water + RGB 31,31,27, 31,31,07, 31,16,01, 07,07,07 ; yellow + RGB 31,31,27, 26,19,07, 20,14,03, 07,07,07 ; brown + RGB 31,31,27, 15,31,31, 05,17,31, 07,07,07 ; roof + RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text + +;SnowyNitePalette: +; RGB 15,14,24, 11,11,22, 07,07,16, 00,00,00 ; gray +; RGB 15,14,24, 14,07,17, 13,00,08, 00,00,00 ; red +; RGB 15,14,24, 02,12,23, 05,05,17, 00,00,00 ; green (cyan) +; RGB 15,13,27, 10,09,20, 04,03,18, 00,00,00 ; water +; RGB 30,30,11, 16,14,18, 16,14,10, 00,00,00 ; yellow +; RGB 15,14,24, 12,09,15, 08,04,05, 00,00,00 ; brown +; RGB 15,14,24, 13,12,23, 11,09,20, 00,00,00 ; roof +; RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text + \ No newline at end of file diff --git a/maps/Route57.ablk b/maps/Route57.ablk new file mode 100644 index 0000000..f524d7c --- /dev/null +++ b/maps/Route57.ablk @@ -0,0 +1,3 @@ +         +  +  \ No newline at end of file diff --git a/maps/Route57.asm b/maps/Route57.asm new file mode 100644 index 0000000..c3ce8eb --- /dev/null +++ b/maps/Route57.asm @@ -0,0 +1,20 @@ + object_const_def + +Route57_MapScripts: + def_scene_scripts + + def_callbacks + +Route57_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 12, 48, SAVOY_CITY, 2 + warp_event 13, 48, SAVOY_CITY, 3 + + def_coord_events + + def_bg_events + + def_object_events + diff --git a/maps/SavoyCity.asm b/maps/SavoyCity.asm index fe5ca86..570d01c 100644 --- a/maps/SavoyCity.asm +++ b/maps/SavoyCity.asm @@ -187,8 +187,8 @@ SavoyCity_MapEvents: def_warp_events warp_event 33, 15, ROUTE_50_SAVOY_CITY_GATE, 1 ;east gate - warp_event 22, 5, DEBUG_ROOM, 1 ;north gate, left - warp_event 23, 5, DEBUG_ROOM, 1 ;north gate, right + warp_event 22, 5, ROUTE_57, 1 ;north gate, left + warp_event 23, 5, ROUTE_57, 2 ;north gate, right warp_event 4, 8, CORAL_CITY, 1 ;port north warp_event 4, 9, CORAL_CITY, 2 ;port south warp_event 25, 14, SAVOY_CITY_POKECENTER_1F, 1 ; pokecenter diff --git a/maps/SunglowCity.ablk b/maps/SunglowCity.ablk new file mode 100644 index 0000000..cc44906 --- /dev/null +++ b/maps/SunglowCity.ablk @@ -0,0 +1,3 @@ + + "# + *+/&',-.123 !$%0()4"#& \ No newline at end of file diff --git a/maps/SunglowCity.asm b/maps/SunglowCity.asm new file mode 100644 index 0000000..4ac3005 --- /dev/null +++ b/maps/SunglowCity.asm @@ -0,0 +1,20 @@ + object_const_def + +SunglowCity_MapScripts: + def_scene_scripts + + def_callbacks + +SunglowCity_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 8, 5, DEBUG_ROOM, 1 + warp_event 9, 5, DEBUG_ROOM, 1 + + def_coord_events + + def_bg_events + + def_object_events +