Brunswick groundwork, misc. changes

The groundwork for Brunswick Trail events has been done. Wild data, Cactus event, and Zapdos-G events are set up, plus an NPC. This also makes the Fake Tree sprite available.

I made the warp at the tunnel in Brunswick goes directly to Celeste Hill and back. Warp tile made functional.

Many bugs right now:
- Cactus doesn't disappear after battling it. Also, making this work how I want it to is hard.
- Pokemon are encountered on every tile, which is likely because it's considered to be indoors. In trying to fix this, I seemed to completely screw up the maps, so this isn't being committed. Handle this with care.
- I made a spriteset specifically for Citrine, but it doesn't seem to be working for Brunswick, likely because Brunswick is an indoor map and thus isn't just taking it.

Misc. changes:
- Moved Sandy Shocks to a 4% encounter slot in Mt. Moon Crater to be equal to Scream Tail.
- Restored the proper translation for the "rotten PRESIDENT" scientist, courtesy of Dr. Lava and Nob Ogasawara.

data/maps/hide_show_data.asm

@@ -17,9 +17,9 @@ MapHSPointers:
 	dw NoHS
 	dw NoHS
 	dw Route1HS
-	dw Route2HS
+	dw NoHS ; Route2HS is unnecessary due to new events replacing it.
 	dw NoHS
-	dw Route4HS
+	dw NoHS ; Route4HS was made unnecessary from replacements
 	dw NoHS
 	dw NoHS
 	dw NoHS
@@ -177,7 +177,7 @@ MapHSPointers:
 	dw NoHS
 	dw NoHS
 	dw NoHS
-	dw NoHS
+	dw BrunswickTrailHS
 	dw NoHS
 	dw NoHS
 	dw NoHS
@@ -293,11 +293,11 @@ SaffronCityHS:
 	db SAFFRON_CITY, $0E, SHOW
 	db SAFFRON_CITY, $0F, HIDE
 	db SAFFRON_CITY, $1A, HIDE
-Route2HS:
-	;db ROUTE_2, $01, SHOW - removed for the former
-	db ROUTE_2, $02, SHOW
-Route4HS:
-	db ROUTE_4, $03, SHOW
+;Route2HS: - made redundant.
+	;db ROUTE_2, $01, SHOW
+	;db ROUTE_2, $02, SHOW
+;Route4HS:
+	;db ROUTE_4, $03, SHOW
 Route9HS:
 	db ROUTE_9, $0A, SHOW
 Route12HS:
@@ -555,6 +555,9 @@ VictoryRoad1FHS:
 	db VICTORY_ROAD_1F, $04, SHOW
 ChampionsRoomHS:
 	db CHAMPIONS_ROOM, $02, HIDE
+BrunswickTrailHS:
+	db BRUNSWICK_TRAIL, $01, SHOW
+	db BRUNSWICK_TRAIL, $03, SHOW ; to test, SHOW, otherwise HIDE
 SeafoamIslands1FHS:
 	db SEAFOAM_ISLANDS_1F, $01, SHOW
 	db SEAFOAM_ISLANDS_1F, $02, SHOW

data/maps/objects/BrunswickTrail.asm

@@ -7,5 +7,8 @@ BrunswickTrail_Object:
 	def_bg_events
 
 	def_object_events
+	object_event 29, 11, SPRITE_FAKE_TREE, STAY, NONE, 1, CACTUS, 60 | OW_POKEMON ; person
+	object_event 37, 23, SPRITE_BRUNETTE_GIRL, STAY, DOWN, 2 ; person
+	object_event 46,  7, SPRITE_BIRD, STAY, DOWN, 3, ZAPDOS_G, 70 | OW_POKEMON ; person
 
 	def_warps_to BRUNSWICK_TRAIL

data/maps/objects/CelesteHill.asm

@@ -2,8 +2,7 @@ CelesteHill_Object:
 	db $0 ; border block
 
 	def_warp_events
-	warp_event 13, 23, ROUTE_1, 1
-	warp_event 12, 23, ROUTE_1, 1
+	warp_event 13, 23, BRUNSWICK_TRAIL, 1
 
 	def_bg_events
 

data/maps/sprite_sets.asm

@@ -14,7 +14,7 @@ MapSpriteSets:
 	db SPRITESET_SAFFRON         ; SAFFRON_CITY
 	db SPRITESET_PALLET_VIRIDIAN ; CINNABAR_ISLAND
 	db SPRITESET_INDIGO          ; INDIGO_PLATEAU
-	db SPRITESET_PALLET_VIRIDIAN ; CITRINE_CITY
+	db SPRITESET_CITRINE ; CITRINE_CITY
 	db SPRITESET_PALLET_VIRIDIAN ; ROUTE_1
 	db SPLITSET_ROUTE_2          ; ROUTE_2
 	db SPRITESET_PEWTER_CERULEAN ; ROUTE_3
@@ -198,4 +198,17 @@ SpriteSets:
 	db SPRITE_POKE_BALL
 	db SPRITE_FOSSIL
 
+; SPRITESET_CITRINE
+	db SPRITE_BRUNETTE_GIRL
+	db SPRITE_BIRD
+	db SPRITE_SUPER_NERD ; free slot, add as needed.
+	db SPRITE_HIKER ; free slot, add as needed.
+	db SPRITE_GAMBLER ; free slot, add as needed.
+	db SPRITE_MONSTER ; free slot, add as needed.
+	db SPRITE_COOLTRAINER_F ; free slot, add as needed.
+	db SPRITE_COOLTRAINER_M ; free slot, add as needed.
+	db SPRITE_GUARD ; free slot, add as needed.
+	db SPRITE_POKE_BALL ; probably not free
+	db SPRITE_FAKE_TREE
+
 	assert_table_length NUM_SPRITE_SETS