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.

constants/event_constants.asm

@@ -785,6 +785,8 @@
 
 ; Safari Zone events
 	const_next $880
+	const EVENT_BEAT_CACTUS
+	const EVENT_BEAT_ZAPDOSG
 	const EVENT_GOT_HM03
 	const EVENT_GOT_MELTAN
 

constants/hide_show_constants.asm

@@ -35,8 +35,6 @@ DEF SHOW EQU $15
 	const HS_SAFFRON_CITY_E                ; 17
 	const HS_SAFFRON_CITY_F                ; 18
 	const HS_SAFFRON_CITY_UP_GRADE         ; 19
-	const HS_ROUTE_2_ITEM_2                ; 1A X
-	const HS_ROUTE_4_ITEM                  ; 1B X
 	const HS_ROUTE_9_ITEM                  ; 1C X
 	const HS_ROUTE_12_SNORLAX              ; 1D
 	const HS_ROUTE_12_ITEM_1               ; 1E X
@@ -225,6 +223,8 @@ DEF SHOW EQU $15
 	const HS_VICTORY_ROAD_1F_ITEM_1        ; D4 X
 	const HS_VICTORY_ROAD_1F_ITEM_2        ; D5 X
 	const HS_CHAMPIONS_ROOM_OAK            ; D6
+	const HS_CACTUS			               ; 1A was ROUTE_2_ITEM_2
+	const HS_ZAPDOSG                  	   ; 1B was ROUTE_4_ITEM
 	const HS_SEAFOAM_ISLANDS_1F_BOULDER_1  ; D7
 	const HS_SEAFOAM_ISLANDS_1F_BOULDER_2  ; D8
 	const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; D9

constants/sprite_constants.asm

@@ -83,7 +83,7 @@ DEF FIRST_STILL_SPRITE EQU const_value
 	const SPRITE_POKEDEX                 ; $4b
 	const SPRITE_CLIPBOARD               ; $4c
 	const SPRITE_SNORLAX                 ; $4d
-	const SPRITE_UNUSED_OLD_AMBER        ; $4e
+	const SPRITE_FAKE_TREE        ; $4e was SPRITE_UNUSED_OLD_AMBER
 	const SPRITE_OLD_AMBER               ; $4f
 	const SPRITE_UNUSED_GAMBLER_ASLEEP_1 ; $50
 	const SPRITE_UNUSED_GAMBLER_ASLEEP_2 ; $51

constants/sprite_set_constants.asm

@@ -13,6 +13,7 @@
 	const SPRITESET_SILENCE_BRIDGE  ; 08
 	const SPRITESET_CYCLING_ROAD    ; 09
 	const SPRITESET_FUCHSIA         ; 0a
+	const SPRITESET_CITRINE			; 0b
 DEF NUM_SPRITE_SETS EQU const_value - 1
 
 ; split sprite set ids