diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index a9b69d33..0dd9c8b6 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -89,13 +89,13 @@ DEF FIRST_INDOOR_MAP EQU const_value
 	mapconst BIKE_SHOP,                      4,  4 ; $43
 	mapconst CERULEAN_MART,                  4,  4 ; $44
 	mapconst MT_MOON_POKECENTER,             4,  7 ; $45
-	mapconst VIRIDIAN_PRE_GYM,		     7,  5 ; $46	- was CERULEAN_TRASHED_HOUSE_COPY
+	mapconst VIRIDIAN_PRE_GYM,		         7,  5 ; $46	- was CERULEAN_TRASHED_HOUSE_COPY
 	mapconst ROUTE_5_GATE,                   3,  4 ; $47
 	mapconst UNDERGROUND_PATH_ROUTE_5,       4,  4 ; $48
 	mapconst DAYCARE,                        4,  4 ; $49
 	mapconst ROUTE_6_GATE,                   3,  4 ; $4A
 	mapconst UNDERGROUND_PATH_ROUTE_6,       4,  4 ; $4B
-	mapconst CELESTE_HILL,  				4, 4 ; $4C	- Was copy of above & unused
+	mapconst CELESTE_HILL,  				12, 12 ; $4C	- Was copy of above & unused
 	mapconst ROUTE_7_GATE,                   4,  3 ; $4D
 	mapconst UNDERGROUND_PATH_ROUTE_7,       4,  4 ; $4E
 	mapconst UNDERGROUND_PATH_ROUTE_7_COPY,  4,  4 ; $4F	- Unused
diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm
index 42097e81..ffae94db 100644
--- a/constants/palette_constants.asm
+++ b/constants/palette_constants.asm
@@ -46,29 +46,32 @@ DEF SET_PAL_DEFAULT EQU $ff
 	const PAL_INDIGO    ; $0A
 	const PAL_SAFFRON   ; $0B
 	const PAL_CITRINE	; $0C
-	const PAL_TOWNMAP   ; $0D
-	const PAL_LOGO1     ; $0E
-	const PAL_LOGO2     ; $0F
-	const PAL_0F        ; $10
-	const PAL_MEWMON    ; $11
-	const PAL_BLUEMON   ; $12
-	const PAL_REDMON    ; $13
-	const PAL_CYANMON   ; $14
-	const PAL_PURPLEMON ; $15
-	const PAL_BROWNMON  ; $16
-	const PAL_GREENMON  ; $17
-	const PAL_PINKMON   ; $18
-	const PAL_YELLOWMON ; $19
-	const PAL_GREYMON   ; $1A
-	const PAL_SLOTS1    ; $1B
-	const PAL_SLOTS2    ; $1C
-	const PAL_SLOTS3    ; $1D
-	const PAL_SLOTS4    ; $1E
-	const PAL_BLACK     ; $1F
-	const PAL_GREENBAR  ; $20
-	const PAL_YELLOWBAR ; $21
-	const PAL_REDBAR    ; $22
-	const PAL_BADGE     ; $23
-	const PAL_CAVE      ; $24
-	const PAL_GAMEFREAK ; $25
+	const PAL_CELADONUNI ; $0D
+	const PAL_TOWNMAP   ; $0E
+	const PAL_LOGO1     ; $0F
+	const PAL_LOGO2     ; $10
+	const PAL_0F        ; $11
+	const PAL_MEWMON    ; $12
+	const PAL_BLUEMON   ; $13
+	const PAL_REDMON    ; $14
+	const PAL_CYANMON   ; $15
+	const PAL_PURPLEMON ; $16
+	const PAL_BROWNMON  ; $17
+	const PAL_GREENMON  ; $18
+	const PAL_PINKMON   ; $19
+	const PAL_YELLOWMON ; $1A
+	const PAL_GREYMON   ; $1B
+	const PAL_SLOTS1    ; $1C
+	const PAL_SLOTS2    ; $1D
+	const PAL_SLOTS3    ; $1E
+	const PAL_SLOTS4    ; $1F
+	const PAL_BLACK     ; $20
+	const PAL_GREENBAR  ; $21
+	const PAL_YELLOWBAR ; $22
+	const PAL_REDBAR    ; $23
+	const PAL_BADGE     ; $24
+	const PAL_CAVE      ; $25
+	const PAL_GAMEFREAK ; $26
+	const PAL_CELESTE	; $27
+	const PAL_CITRINECAVE ; $28
 DEF NUM_SGB_PALS EQU const_value
diff --git a/data/maps/names.asm b/data/maps/names.asm
index 18a94271..14488857 100644
--- a/data/maps/names.asm
+++ b/data/maps/names.asm
@@ -10,7 +10,7 @@ CinnabarIslandName:  db "CINNABAR ISLAND@"
 IndigoPlateauName:   db "INDIGO PLATEAU@"
 SaffronCityName:     db "SAFFRON CITY@"
 CitrineCityName:     db "CITRINE CITY@"
-CeladonUniversityName: db "CELADON UNIVERSITY@"
+CeladonUniversityName: db "CELADON UNI.@"
 Route1Name:          db "ROUTE 1@"
 Route2Name:          db "ROUTE 2@"
 Route3Name:          db "ROUTE 3@"
diff --git a/data/maps/objects/CelesteHill.asm b/data/maps/objects/CelesteHill.asm
index fd129076..2df6d55d 100644
--- a/data/maps/objects/CelesteHill.asm
+++ b/data/maps/objects/CelesteHill.asm
@@ -2,7 +2,8 @@ CelesteHill_Object:
 	db $0 ; border block
 
 	def_warp_events
-	warp_event  4, 11, 0, REDS_HOUSE_2F
+	warp_event 13, 23, ROUTE_1, 1
+	warp_event 12, 23, ROUTE_1, 1
 
 	def_bg_events
 
diff --git a/data/maps/objects/Route1.asm b/data/maps/objects/Route1.asm
index e480c20b..db51fc98 100644
--- a/data/maps/objects/Route1.asm
+++ b/data/maps/objects/Route1.asm
@@ -2,6 +2,7 @@ Route1_Object:
 	db $b ; border block
 
 	def_warp_events
+	warp_event 5, 3, CELESTE_HILL, 1
 
 	def_bg_events
 	bg_event  9, 27, 3 ; Route1Text3
diff --git a/data/maps/songs.asm b/data/maps/songs.asm
index d6d2f4b2..d7035ba6 100644
--- a/data/maps/songs.asm
+++ b/data/maps/songs.asm
@@ -76,7 +76,7 @@ MapSongBanks::
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; DAYCARE
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_6_GATE
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_6
-	db MUSIC_VERMILION, BANK(Music_Vermilion) ; UNDERGROUND_PATH_ROUTE_6_COPY
+	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; CELESTE_HILL, was UNDERGROUND_PATH_ROUTE_6_COPY
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_7_GATE
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_7
 	db MUSIC_CELADON, BANK(Music_Celadon) ; UNDERGROUND_PATH_ROUTE_7_COPY
diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm
index 7e17f867..7528b0a5 100644
--- a/data/maps/town_map_entries.asm
+++ b/data/maps/town_map_entries.asm
@@ -67,6 +67,8 @@ InternalMapEntries:
 	internal_map MT_MOON_POKECENTER,             5,  2, Route4Name
 	internal_map VIRIDIAN_PRE_GYM,  			10,  2, ViridianCityName
 	internal_map DAYCARE,                       10,  4, Route5Name
+	internal_map UNDERGROUND_PATH_ROUTE_6, 		10,  8, Route6Name
+	internal_map CELESTE_HILL, 					 6, 10, CelesteHillName
 	internal_map UNDERGROUND_PATH_ROUTE_7_COPY,  9,  5, Route7Name
 	internal_map UNDERGROUND_PATH_ROUTE_8,      11,  5, Route8Name
 	internal_map ROCK_TUNNEL_1F,                14,  3, RockTunnelName
@@ -123,7 +125,7 @@ InternalMapEntries:
 	internal_map ROCK_TUNNEL_B1F,               14,  3, RockTunnelName
 	internal_map SILPH_CO_ELEVATOR,             10,  5, SilphCoName
 	internal_map UNDERWATER_TUNNEL,             14,  1, UnderwaterTunnelName
-	internal_map CELADON_UNIVERSITY_POKECENTER,   7, 4, CeladonCityName
+	internal_map CELADON_UNIVERSITY_POKECENTER,  7,  4, CeladonUniversityName
+	internal_map BILLS_GARDEN,                  12,  0, SeaCottageName
 	internal_map AGATHAS_ROOM,                   0,  2, PokemonLeagueName
-	internal_map CELESTE_HILL, 					 9,  9, CelesteHillName
 	db -1 ; end
diff --git a/data/maps/town_map_order.asm b/data/maps/town_map_order.asm
index 84f1fa45..743f0dbe 100644
--- a/data/maps/town_map_order.asm
+++ b/data/maps/town_map_order.asm
@@ -27,7 +27,7 @@ TownMapOrder:
 	db ROUTE_8
 	db ROUTE_7
 	db CELADON_CITY
-;	db CELADON_UNIVERSITY_OUTSIDE ; erosunica: uncomment this line to add it to the Town Map
+	db CELADON_UNIVERSITY_OUTSIDE
 	db SAFFRON_CITY
 	db ROUTE_11
 	db ROUTE_12
@@ -50,5 +50,6 @@ TownMapOrder:
 	db VICTORY_ROAD_3F
 	db INDIGO_PLATEAU
 	db CITRINE_CITY
+	db CELESTE_HILL
 	db FARAWAY_ISLAND_OUTSIDE
 TownMapOrderEnd:
diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm
index 86a56a4f..2f33404e 100644
--- a/data/sgb/sgb_palettes.asm
+++ b/data/sgb/sgb_palettes.asm
@@ -14,6 +14,7 @@ SuperPalettes:
 	RGB 31,31,31, 11,08,31, 11,23,31, 03,03,03 ; PAL_INDIGO
 	RGB 31,31,31, 31,31,00, 11,23,31, 03,03,03 ; PAL_SAFFRON
 	RGB 31,31,31, 30,26,01, 11,23,31, 03,03,03 ; PAL_CITRINE
+	RGB 31,31,31, 05,31,05, 11,23,31, 03,03,03 ; PAL_CELADONUNI
 	RGB 31,31,31, 00,21,31, 10,28,00, 01,01,01 ; PAL_TOWNMAP
 	RGB 31,31,31, 31,31,00, 25,10,31, 19,00,23 ; PAL_LOGO1
 	RGB 31,31,31, 31,31,00, 07,07,25, 00,00,17 ; PAL_LOGO2
@@ -39,4 +40,6 @@ SuperPalettes:
 	RGB 31,31,31, 03,11,06, 03,17,11, 03,03,03 ; PAL_BADGE
 	RGB 31,31,31, 23,08,00, 17,14,11, 03,03,03 ; PAL_CAVE
 	RGB 31,31,31, 31,19,00, 19,19,00, 03,03,03 ; PAL_GAMEFREAK
+	RGB 31,31,31, 01,30,31, 11,23,31, 03,03,03 ; PAL_CELESTE
+	RGB 31,31,31, 31,04,04, 06,06,26, 03,03,03 ; PAL_CITRINECAVE
 	assert_table_length NUM_SGB_PALS
diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm
index 24237f0b..ae9b53af 100644
--- a/data/tilesets/collision_tile_ids.asm
+++ b/data/tilesets/collision_tile_ids.asm
@@ -73,7 +73,7 @@ PreGym_Coll::
 	coll_tiles $0B, $0E, $1E, $1F
 
 Citrine_Coll::
-	coll_tiles $2C, $31, $3F, $55, $0E, $2F, $23, $20, $10, $03, $1C, $1B, $0B, $0C, $21
+	coll_tiles $2C, $31, $3F, $55, $0E, $2F, $23, $20, $10, $03, $1C, $1B, $0B, $0C, $21, $39, $3C, $48, $49, $58, $59
 
 Celeste_Coll::
 	coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f, $09, $08, $18, $19
\ No newline at end of file
diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm
index fdce7c60..62826061 100644
--- a/data/wild/grass_water.asm
+++ b/data/wild/grass_water.asm
@@ -76,7 +76,7 @@ WildDataPointers:
 	dw NothingWildMons
 	dw NothingWildMons
 	dw NothingWildMons
-	dw NothingWildMons
+	dw CelesteHillWildMons
 	dw NothingWildMons
 	dw NothingWildMons
 	dw NothingWildMons
@@ -332,4 +332,5 @@ INCLUDE "data/wild/maps/SilphGauntlet6F.asm"
 INCLUDE "data/wild/maps/FarawayIslandInside.asm"
 INCLUDE "data/wild/maps/MtMoonCrater.asm"
 INCLUDE "data/wild/maps/UnderwaterTunnel.asm"
-INCLUDE "data/wild/maps/BillsGarden.asm"
\ No newline at end of file
+INCLUDE "data/wild/maps/BillsGarden.asm"
+INCLUDE "data/wild/maps/CelesteHill.asm"
\ No newline at end of file
diff --git a/data/wild/maps/CelesteHill.asm b/data/wild/maps/CelesteHill.asm
new file mode 100644
index 00000000..cd8adbed
--- /dev/null
+++ b/data/wild/maps/CelesteHill.asm
@@ -0,0 +1,16 @@
+CelesteHillWildMons:
+	def_grass_wildmons 10 ; encounter rate
+	db 55, FEAROW
+	db 55, PIDGEOT
+	db 56, MADAAMU
+	db 56, FEAROW
+	db 57, SCYTHER
+	db 57, MADAAMU
+	db 70, ARTICUNO_G	; currently placeholders before static encounters are added
+	db 70, ZAPDOS_G
+	db 70, MOLTRES_G
+	db 70, MOLTRES_G
+	end_grass_wildmons
+
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons
diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm
index 01ad980f..394c35cf 100644
--- a/engine/gfx/palettes.asm
+++ b/engine/gfx/palettes.asm
@@ -144,6 +144,8 @@ SetPal_Overworld:
 	jr z, .PokemonTowerOrAgatha
 	cp CAVERN
 	jr z, .caveOrBruno
+	cp CELESTE
+	jr z, .celeste
 	ld a, [wCurMap]
 	cp FIRST_INDOOR_MAP
 	jr c, .townOrRoute
@@ -151,6 +153,8 @@ SetPal_Overworld:
 	jr c, .normalDungeonOrBuilding
 	cp LORELEIS_ROOM
 	jr z, .Lorelei
+	cp CELESTE_HILL
+	jr z, .celeste
 	cp BRUNOS_ROOM
 	jr z, .caveOrBruno
 .normalDungeonOrBuilding
@@ -183,6 +187,9 @@ SetPal_Overworld:
 .caveDefault
 	ld a, PAL_CAVE - 1
 	jr .town
+.celeste
+	ld a, PAL_CELESTE - 1
+	jr .town
 .Lorelei
 	jr c, .gbcLorelei
 	jr .seafoam
diff --git a/gfx/blocksets/celeste.bst b/gfx/blocksets/celeste.bst
index 4dd7d758..a5360ad6 100644
Binary files a/gfx/blocksets/celeste.bst and b/gfx/blocksets/celeste.bst differ
diff --git a/maps/CelesteHill.blk b/maps/CelesteHill.blk
index e1fcc936..499ab83e 100644
--- a/maps/CelesteHill.blk
+++ b/maps/CelesteHill.blk
@@ -1 +1 @@
-((,n_Uo,/%).$ (( qZ~/(((‚rU, „?ƒan(a…C@ƒi(,((i…B@ƒj€ˆ…B@†s.†‡BDEEEFDEEF
\ No newline at end of file
+<@B>@@BB@@nU_U_oBB@@%"#$BB@@qZ

qBB@D‚rUZ%_r„FB@ƒanoa…B@ƒiU((_i…B@ƒj€ˆ…B@†s.†‡B@B@BDEEEEFYDEEEF
\ No newline at end of file
diff --git a/maps/Route1.blk b/maps/Route1.blk
index 56a9e4a3..8e6f45e4 100644
--- a/maps/Route1.blk
+++ b/maps/Route1.blk
@@ -1,8 +1,6 @@
 
 MRRO1PRRN
-M
-
-
+M
 1
 
 tN
diff --git a/scripts/CelesteHill.asm b/scripts/CelesteHill.asm
index bb57cc70..c1eff6c8 100644
--- a/scripts/CelesteHill.asm
+++ b/scripts/CelesteHill.asm
@@ -3,4 +3,5 @@ CelesteHill_Script:
 
 CelesteHill_TextPointers:
 
-	text_end ; unused
\ No newline at end of file
+	text_end ; unused
+	
\ No newline at end of file