Fuchsia City

5 files changed, 17 insertions, 14 deletions

diff --git a/constants/event_constants.asm b/constants/event_constants.asm
index b0c67e4b..7fc3b509 100644
--- a/constants/event_constants.asm
+++ b/constants/event_constants.asm
@@ -1400,13 +1400,13 @@ const_value = 0
 	const EVENT_BEAT_MT_MOON_1_TRAINER_5             ; 575, (D7F5, bit 5)
 	const EVENT_BEAT_MT_MOON_1_TRAINER_6             ; 576, (D7F5, bit 6)
 	const EVENT_BEAT_MT_MOON_1_TRAINER_7             ; 577, (D7F5, bit 7)
-	const EVENT_578                                  ; 578, (D7F6, bit 0)
+	const EVENT_GOT_DOME_FOSSIL                      ; 578, (D7F6, bit 0)
 	const EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD         ; 579, (D7F6, bit 1)
 	const EVENT_BEAT_MT_MOON_3_TRAINER_0             ; 57A, (D7F6, bit 2)
 	const EVENT_BEAT_MT_MOON_3_TRAINER_2             ; 57B, (D7F6, bit 3)
 	const EVENT_BEAT_MT_MOON_3_TRAINER_3             ; 57C, (D7F6, bit 4)
 	const EVENT_BEAT_MT_MOON_3_TRAINER_4             ; 57D, (D7F6, bit 5)
-	const EVENT_GOT_DOME_FOSSIL                      ; 57E, (D7F6, bit 6)
+	const EVENT_57E                                  ; 57E, (D7F6, bit 6)
 	const EVENT_GOT_HELIX_FOSSIL                     ; 57F, (D7F6, bit 7)
 	const EVENT_580                                  ; 580, (D7F7, bit 0)
 	const EVENT_581                                  ; 581, (D7F7, bit 1)
diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/fuchsiacity.asm
index 85f801d9..c64760c0 100755
--- a/data/mapObjects/fuchsiacity.asm
+++ b/data/mapObjects/fuchsiacity.asm
@@ -33,7 +33,7 @@ FuchsiaCityObject: ; 0x18bd4 (size=178)
 	object SPRITE_GAMBLER, $1c, $11, WALK, $2, $2 ; person
 	object SPRITE_FISHER2, $1e, $e, STAY, DOWN, $3 ; person
 	object SPRITE_BUG_CATCHER, $18, $8, STAY, UP, $4 ; person
-	object SPRITE_CLEFAIRY, $1f, $5, WALK, $0, $5 ; person
+	object SPRITE_CHANSEY, $1f, $5, STAY, DOWN, $5 ; person
 	object SPRITE_BALL, $19, $6, STAY, NONE, $6 ; person
 	object SPRITE_SLOWBRO, $c, $6, WALK, $2, $7 ; person
 	object SPRITE_SLOWBRO, $1e, $c, WALK, $2, $8 ; person
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 22b939d6..cf1ca6cc 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -7,7 +7,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db $11 ; db BANK(LavenderTown_h) ; LAVENDER_TOWN
 	db BANK(VermilionCity_h) ; VERMILION_CITY
 	db BANK(CeladonCity_h) ; CELADON_CITY
-	db $06 ; db BANK(FuchsiaCity_h) ; FUCHSIA_CITY
+	db BANK(FuchsiaCity_h) ; FUCHSIA_CITY
 	db BANK(CinnabarIsland_h) ; CINNABAR_ISLAND
 	db BANK(IndigoPlateau_h) ; INDIGO_PLATEAU
 	db BANK(SaffronCity_h) ; SAFFRON_CITY
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 7ac1d910..adec78bc 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -7,7 +7,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw $4000 ; dw LavenderTown_h
 	dw VermilionCity_h
 	dw CeladonCity_h
-	dw $4bb3 ; dw FuchsiaCity_h
+	dw FuchsiaCity_h
 	dw CinnabarIsland_h
 	dw IndigoPlateau_h
 	dw SaffronCity_h
diff --git a/main.asm b/main.asm
index 8eaf7c9a..d5da1a30 100755
--- a/main.asm
+++ b/main.asm
@@ -255,10 +255,8 @@ CeruleanCityBlocks: INCBIN "maps/ceruleancity.blk" ; 18836
 INCLUDE "data/mapHeaders/vermilioncity.asm"
 INCLUDE "data/mapObjects/vermilioncity.asm"
 VermilionCityBlocks: INCBIN "maps/vermilioncity.blk"
-
-	dr $18bb3,$18c92 ; headers, objects, blocks
-; INCLUDE "data/mapHeaders/fuchsiacity.asm"
-; INCLUDE "data/mapObjects/fuchsiacity.asm"
+INCLUDE "data/mapHeaders/fuchsiacity.asm"
+INCLUDE "data/mapObjects/fuchsiacity.asm"
 FuchsiaCityBlocks: INCBIN "maps/fuchsiacity.blk"
 
 
@@ -268,9 +266,8 @@ INCLUDE "scripts/pewtercity.asm"
 INCLUDE "scripts/ceruleancity.asm"
 INCLUDE "scripts/vermilioncity.asm"
 INCLUDE "scripts/celadoncity.asm"
-
-	dr $19b2b,$1a4ea
-; INCLUDE "scripts/fuchsiacity.asm"
+INCLUDE "scripts/fuchsiacity.asm"
+	dr $19c2f,$1a4ea
 
 INCLUDE "engine/overworld/npc_movement.asm"
 INCLUDE "engine/overworld/doors.asm"
@@ -895,10 +892,16 @@ INCBIN "maps/route8.blk"
 	dr $582d4,$5855f
 Route11Blocks: ; 5854f
 INCBIN "maps/route11.blk"
-	dr $5866d,$58b84
+	dr $5866d,$589cc
+Route15Blocks:
+INCBIN "maps/route15.blk"
+	dr $58ada,$58b84
 Route16Blocks: ; 58b84
 INCBIN "maps/route16.blk"
-	dr $58c38,$58d99
+	dr $58c38,$58c9c
+Route18Blocks:
+INCBIN "maps/route18.blk"
+	dr $58d7d,$58d99
 
 INCLUDE "engine/experience.asm"