diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 40306be..19c067c 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -697,6 +697,9 @@ ENDM map_const ROUTE_52_RUDDY_TOWN_GATE, 5, 4 ; 6 map_const ROUTE_53_RUDDY_TOWN_GATE, 5, 4 ; 7 map_const ROUTE_54_RUDDY_TOWN_GATE, 5, 4 ; 8 + endgroup + + newgroup OCHRE_TOWN map_const ROUTE_53, 35, 9 ; 9 endgroup diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm index d48bf42..247a987 100644 --- a/constants/scgb_constants.asm +++ b/constants/scgb_constants.asm @@ -189,6 +189,8 @@ DEF SCGB_DEFAULT EQU $ff const PREDEFPAL_AVENTURINE_MORN const PREDEFPAL_SUNGLOW_CITY const PREDEFPAL_SUNGLOW_CITY_MORN + const PREDEFPAL_OCHRE_TOWN + const PREDEFPAL_OCHRE_TOWN_MORN DEF NUM_PREDEF_PALS EQU const_value ; SGB system command codes diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 03902fd..b04d2db 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -56,10 +56,11 @@ MapGroupPointers:: dw MapGroup_SavoyCity ; 37 dw MapGroup_CoralCity ; 38 dw MapGroup_RuddyTown ; 39 - dw MapGroup_SunglowCity ; 40 - dw MapGroup_BlueForest ; 41 - dw MapGroup_Aventurine ; 42 - dw MapGroup_WhiteCity ; 43 + dw MapGroup_OchreTown ; 40 + dw MapGroup_SunglowCity ; 41 + dw MapGroup_BlueForest ; 42 + dw MapGroup_Aventurine ; 43 + dw MapGroup_WhiteCity ; 44 assert_table_length NUM_MAP_GROUPS MapGroup_Olivine: @@ -763,11 +764,15 @@ MapGroup_RuddyTown: map RuddyTownBigHouse1, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_RUDDY_TOWN, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE map RuddyTownBigHouse2, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_RUDDY_TOWN, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE map Route52RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_52, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE - map Route53RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE ; needs new landmark when route is made - map Route54RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE ; see above - map Route53, TILESET_NIHON_FONT, ROUTE, LANDMARK_ROUTE_53, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN + map Route53RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_53, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE + map Route54RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE ; needs new landmark when route is made assert_table_length NUM_RUDDY_TOWN_MAPS - + +MapGroup_OchreTown: + table_width MAP_LENGTH, MapGroup_OchreTown + map Route53, TILESET_NIHON_FONT, ROUTE, LANDMARK_ROUTE_53, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN + assert_table_length NUM_OCHRE_TOWN_MAPS + MapGroup_SunglowCity: table_width MAP_LENGTH, MapGroup_SunglowCity map Route57, TILESET_NIHON_BIRDON, ROUTE, LANDMARK_ROUTE_57, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm index 2d68cde..b8a3338 100644 --- a/data/maps/outdoor_sprites.asm +++ b/data/maps/outdoor_sprites.asm @@ -43,6 +43,7 @@ OutdoorSprites: dw SavoyCityGroupSprites dw CoralCityGroupSprites dw RuddyTownGroupSprites + dw OchreTownGroupSprites dw SunglowCityGroupSprites dw BlueForestGroupSprites dw AventurineCityGroupSprites @@ -338,6 +339,7 @@ BlueForestGroupSprites: ; Will have its own thing eventually SunglowCityGroupSprites: ; Ditto AventurineCityGroupSprites: ; Ditto WhiteCityGroupSprites: ; Ditto +OchreTownGroupSprites: ; Ditto NewBarkGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY diff --git a/data/maps/roofs.asm b/data/maps/roofs.asm index c0f44d4..0953c23 100644 --- a/data/maps/roofs.asm +++ b/data/maps/roofs.asm @@ -51,10 +51,11 @@ MapGroupRoofs: db ROOF_NEW_BARK ; 37 (Savoy City) db ROOF_NEW_BARK ; 38 (Coral City) db ROOF_NEW_BARK ; 39 (Ruddy Town) - db ROOF_NEW_BARK ; 40 (Sunglow City) - db ROOF_NEW_BARK ; 41 (Blue Forest) - db ROOF_NEW_BARK ; 42 (Aventurine City) - db ROOF_NEW_BARK ; 43 (White City) + db ROOF_NEW_BARK ; 40 (Ochre Town) + db ROOF_NEW_BARK ; 41 (Sunglow City) + db ROOF_NEW_BARK ; 42 (Blue Forest) + db ROOF_NEW_BARK ; 43 (Aventurine City) + db ROOF_NEW_BARK ; 44 (White City) assert_table_length NUM_MAP_GROUPS + 1 Roofs: diff --git a/data/maps/sgb_roof_pal_inds.asm b/data/maps/sgb_roof_pal_inds.asm index aa918d2..0763df5 100644 --- a/data/maps/sgb_roof_pal_inds.asm +++ b/data/maps/sgb_roof_pal_inds.asm @@ -43,6 +43,7 @@ MapGroupRoofSGBPalInds: db PREDEFPAL_SAVOY_CITY db PREDEFPAL_CORAL_CITY db PREDEFPAL_RUDDY_TOWN + db PREDEFPAL_OCHRE_TOWN db PREDEFPAL_SUNGLOW_CITY db PREDEFPAL_BLUE_FOREST db PREDEFPAL_AVENTURINE @@ -92,6 +93,7 @@ MapGroupRoofSGBPalIndsMorn: db PREDEFPAL_SAVOY_CITY_MORN db PREDEFPAL_CORAL_CITY_MORN db PREDEFPAL_RUDDY_TOWN_MORN + db PREDEFPAL_OCHRE_TOWN_MORN db PREDEFPAL_SUNGLOW_CITY_MORN db PREDEFPAL_BLUE_FOREST_MORN db PREDEFPAL_AVENTURINE_MORN diff --git a/data/tilesets/nihon_font_attributes.bin b/data/tilesets/nihon_font_attributes.bin index 41bb4ff..16a47cd 100644 Binary files a/data/tilesets/nihon_font_attributes.bin and b/data/tilesets/nihon_font_attributes.bin differ diff --git a/data/tilesets/nihon_font_collision.asm b/data/tilesets/nihon_font_collision.asm index 4e9c293..4f57cad 100644 --- a/data/tilesets/nihon_font_collision.asm +++ b/data/tilesets/nihon_font_collision.asm @@ -68,13 +68,17 @@ tilecoll WALL, WALL, WALL, WALL ; 43 tilecoll WALL, WALL, WALL, DOOR ; 44 tilecoll WALL, WALL, WALL, WALL ; 45 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 46 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 47 + tilecoll WALL, WALL, WALL, WALL ; 46 + tilecoll WALL, WALL, WALL, WALL ; 47 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 48 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 49 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4b + tilecoll WALL, WALL, WALL, WALL ; 4a + tilecoll WALL, WALL, WALL, WALL ; 4b tilecoll WALL, FLOOR, WALL, FLOOR ; 4c tilecoll FLOOR, WALL, FLOOR, WALL ; 4d tilecoll WALL, WALL, WALL, WALL ; 4e tilecoll WALL, WALL, WALL, WALL ; 4f + tilecoll WALL, WALL, WALL, WALL ; 50 + tilecoll WALL, WALL, WALL, WALL ; 51 + tilecoll WALL, WALL, WALL, FLOOR ; 52 + tilecoll WALL, WALL, FLOOR, WALL ; 53 diff --git a/data/tilesets/nihon_font_metatiles.bin b/data/tilesets/nihon_font_metatiles.bin index a4ec5a5..5cbe9ad 100644 Binary files a/data/tilesets/nihon_font_metatiles.bin and b/data/tilesets/nihon_font_metatiles.bin differ diff --git a/data/tilesets/sevii_attributes.bin b/data/tilesets/sevii_attributes.bin index 30aca7e..f7c9a07 100644 Binary files a/data/tilesets/sevii_attributes.bin and b/data/tilesets/sevii_attributes.bin differ diff --git a/data/tilesets/sevii_collision.asm b/data/tilesets/sevii_collision.asm index 0930d65..360c9ce 100644 --- a/data/tilesets/sevii_collision.asm +++ b/data/tilesets/sevii_collision.asm @@ -135,3 +135,7 @@ tilecoll WALL, WALL, WALL, WALL ; 86 tilecoll WALL, WALL, WALL, WALL ; 87 tilecoll FLOOR, FLOOR, WALL, WALL ; 88 + tilecoll WALL, WALL, WALL, WALL ; 89 + tilecoll WALL, WALL, WALL, WALL ; 8a + tilecoll WALL, WALL, WALL, FLOOR ; 8b + tilecoll WALL, WALL, FLOOR, WALL ; 8c diff --git a/data/tilesets/sevii_metatiles.bin b/data/tilesets/sevii_metatiles.bin index 19f7973..068d864 100644 Binary files a/data/tilesets/sevii_metatiles.bin and b/data/tilesets/sevii_metatiles.bin differ diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index 63b0007..1fb9378 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -140,4 +140,6 @@ RGB 31,31,31, 08,25,12, 12,15,20, 00,00,00 ; PREDEFPAL_AVENTURINE_MORN RGB 31,31,31, 29,26,03, 15,20,20, 00,00,00 ; PREDEFPAL_SUNGLOW_CITY RGB 31,31,31, 27,23,01, 12,15,20, 00,00,00 ; PREDEFPAL_SUNGLOW_CITY_MORN # + RGB 31,31,31, 31,20,00, 15,20,20, 00,00,00 ; PREDEFPAL_OCHRE_TOWN + RGB 31,31,31, 28,17,00, 12,15,20, 00,00,00 ; PREDEFPAL_OCHRE_TOWN_MORN # \ No newline at end of file diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index 5754bf1..acf5709 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -459,14 +459,7 @@ INCBIN "data/tilesets/nihon_birdon_metatiles.bin" TilesetNihonBirdonColl:: INCLUDE "data/tilesets/nihon_birdon_collision.asm" -TilesetNihonFontGFX:: -INCBIN "gfx/tilesets/nihon_font.2bpp.lz" -TilesetNihonFontMeta:: -INCBIN "data/tilesets/nihon_font_metatiles.bin" - -TilesetNihonFontColl:: -INCLUDE "data/tilesets/nihon_font_collision.asm" TilesetNihonHighTechGFX:: INCBIN "gfx/tilesets/nihon_hightech.2bpp.lz" @@ -679,4 +672,13 @@ TilesetUnderwaterColl:: INCLUDE "data/tilesets/underwater_collision.asm" TilesetUnderwaterAttr:: -INCBIN "data/tilesets/underwater_attributes.bin" \ No newline at end of file +INCBIN "data/tilesets/underwater_attributes.bin" + +TilesetNihonFontGFX:: +INCBIN "gfx/tilesets/nihon_font.2bpp.lz" + +TilesetNihonFontMeta:: +INCBIN "data/tilesets/nihon_font_metatiles.bin" + +TilesetNihonFontColl:: +INCLUDE "data/tilesets/nihon_font_collision.asm" \ No newline at end of file diff --git a/gfx/tilesets/nihon_font.png b/gfx/tilesets/nihon_font.png index 55a2f86..005c122 100644 Binary files a/gfx/tilesets/nihon_font.png and b/gfx/tilesets/nihon_font.png differ diff --git a/gfx/tilesets/roofs.pal b/gfx/tilesets/roofs.pal index c3f63b2..4bb0e76 100644 --- a/gfx/tilesets/roofs.pal +++ b/gfx/tilesets/roofs.pal @@ -150,19 +150,23 @@ ; group 31 (Ruddy Town) RGB 28,08,05, 20,09,02 ; morn/day RGB 14,07,08, 12,02,04 ; nite + +; group 32 (Ochre Town) + RGB 31,20,00, 26,11,04 ; morn/day + RGB 14,09,08, 12,06,04 ; nite -; group 32 (Sunglow City) +; group 33 (Sunglow City) RGB 30,27,03, 27,18,02 ; morn/day RGB 14,13,09, 08,04,05 ; nite -; group 33 (Blue Forest) +; group 34 (Blue Forest) RGB 24,22,31, 18,14,31 ; morn/day RGB 12,10,24, 08,03,23 ; nite -; group 34 (Aventurine City) +; group 35 (Aventurine City) RGB 03,28,14, 06,20,11 ; morn/day RGB 01,14,14, 00,03,10 ; nite -; group 35 (White City) +; group 36 (White City) RGB 27,28,31, 24,24,26 ; morn/day RGB 13,12,24, 11,09,22 ; nite diff --git a/gfx/tilesets/sevii.png b/gfx/tilesets/sevii.png index 56331fb..f1116b4 100644 Binary files a/gfx/tilesets/sevii.png and b/gfx/tilesets/sevii.png differ diff --git a/maps/Route53.ablk b/maps/Route53.ablk index 524b598..775d510 100644 --- a/maps/Route53.ablk +++ b/maps/Route53.ablk @@ -1,2 +1,2 @@ - )************+ -.....@A...../0"""""""""""""""" $(6,<<<<<<<<<<##!30>< +hAT9Tl‰ŠC=3"07Xpq‹Œ77&#340X(((((mn((! 9\v[(stpo((.)*+9(((X(w((k,,/,,,9><<<<<<<<<<##!30>< :<<<<<<<#9@ :<