Citrine Pokecenter, trade refactoring

I am tired of doing the Legendary wing event, so I'm populating Citrine City.

Some notes;
- I refactored the In-Game Trades to match their nicknames and re-distributed them.
- I swapped Fuschia's bench guy for the third unused one meant for the safe house, but I may outright restore these.
- I refactored the Pokecenter Hidden Objects to all use the same set - they're clones of each other, so this works out. This saves a TON of bytes and works fine.
- I placed the Harry trade for Kadabra/Alakazam in Citrine Pokecenter as it feels right for such a powerful Pokemon to be post-game.

data/maps/objects/CitrineCity.asm

@@ -4,6 +4,7 @@ CitrineCity_Object:
 	def_warp_events
 	warp_event  9, 27, CITRINE_ROCKET_HOUSE, 1
 	warp_event  9, 17, CITRINE_TRADEBACK_HOUSE, 1
+	warp_event 15, 17, CITRINE_POKECENTER, 1
 
 	def_bg_events
 

data/maps/objects/CitrinePokecenter.asm

@@ -0,0 +1,18 @@
+CitrinePokecenter_Object:
+	db $0 ; border block
+
+	def_warp_events
+	warp_event  3,  7, LAST_MAP, 6
+	warp_event  4,  7, LAST_MAP, 6
+
+	def_bg_events
+
+	def_object_events
+	object_event  3,  1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event  5,  4, SPRITE_BRUNETTE_GIRL, WALK, LEFT_RIGHT, 2 ; person
+	object_event 10,  5, SPRITE_COOLTRAINER_M, WALK, ANY_DIR, 3 ; person
+	object_event 11,  2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
+	object_event  8,  3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Sandslash Trader
+	object_event  4,  1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
+
+	def_warps_to CITRINE_POKECENTER

data/maps/objects/FuchsiaCity.asm

@@ -9,8 +9,8 @@ FuchsiaCity_Object:
 	warp_event 18,  3, SAFARI_ZONE_GATE, 1
 	warp_event  5, 27, FUCHSIA_GYM, 1
 	warp_event 22, 13, FUCHSIA_MEETING_ROOM, 1
-	warp_event 31, 27, FUCHSIA_GOOD_ROD_HOUSE, 2
-	warp_event 31, 24, FUCHSIA_GOOD_ROD_HOUSE, 1
+	;warp_event 31, 27, FUCHSIA_GOOD_ROD_HOUSE, 2 these need to be replaced with...something.
+	;warp_event 31, 24, FUCHSIA_GOOD_ROD_HOUSE, 1
 
 	def_bg_events
 	bg_event 15, 23, 11 ; FuchsiaCityText11