Charmander & Rod House move

This adds Damien, the Charmander trainer, with text changed to be more accurate to his character.

I've also moved the Pewter Rod House nearby, as it makes more sense for it to be in the Water-type area. However, it seems to load oddly.

I have also integrated the Pikachu/Eevee Mode more, with architecture that it can make it more easily modified. This'll come into play for the Squirtle event.

I have also erased further misinformation the game gives about burns, and changed the Viridian Pre-Gym accordingly, to talk about confusion, which lacks a Trainer Tips sign.

data/maps/hide_show_data.asm

@@ -322,6 +322,7 @@ Route22HS:
 Route24HS:
 	db ROUTE_24, $01, SHOW                    ; HS_NUGGET_BRIDGE_GUY
 	db ROUTE_24, $08, SHOW                    ; HS_ROUTE_24_ITEM
+	db ROUTE_24, $09, HIDE					  ; HS_DAMIEN
 Route25HS:
 	db ROUTE_25, $0A, SHOW                    ; HS_ROUTE_25_ITEM
 BrunswickTrailHS:
@@ -349,8 +350,6 @@ CeruleanCaveHS:
 	db CERULEAN_CAVE_1F, $01, SHOW            ; HS_CERULEAN_CAVE_1F_ITEM_1
 	db CERULEAN_CAVE_1F, $02, SHOW            ; HS_CERULEAN_CAVE_1F_ITEM_2
 	db CERULEAN_CAVE_1F, $03, SHOW            ; HS_CERULEAN_CAVE_1F_ITEM_3
-DaycareHS:
-	db DAYCARE, $03, SHOW 					  ; HS_DAYCARE_BULBASAUR
 CelesteHillHS:
 	db CELESTE_HILL, $01, SHOW                ; HS_MOLTRES_G
 PokemonTower2FHS:
@@ -609,4 +608,6 @@ RockTunnelB1FHS:
 	db ROCK_TUNNEL_B1F, $0D, SHOW			  ; HS_ROCK_TUNNEL_B1F_WING
 MtMoonSquareHS:
 	db MT_MOON_SQUARE, $04, SHOW              ; HS_MT_MOON_CRATER_GUARD
+DaycareHS:
+	db DAYCARE, $03, SHOW 					  ; HS_DAYCARE_BULBASAUR
 	assert_table_length NUM_HS_OBJECTS + 1

data/maps/objects/PewterCity.asm

@@ -9,7 +9,6 @@ PewterCity_Object:
 	warp_event 23, 17, PEWTER_MART, 1
 	warp_event  7, 29, PEWTER_SPEECH_HOUSE, 1
 	warp_event 13, 25, PEWTER_POKECENTER, 1
-	warp_event  7, 11, ROUTE_12_SUPER_ROD_HOUSE, 1
 
 	def_bg_events
 	bg_event 19, 29,  6 ; PewterCityText6

data/maps/objects/Route12SuperRodHouse.asm

@@ -2,8 +2,8 @@ Route12SuperRodHouse_Object:
 	db $a ; border block
 
 	def_warp_events
-	warp_event  2,  7, LAST_MAP, 8
-	warp_event  3,  7, LAST_MAP, 8
+	warp_event  2,  7, LAST_MAP, 1
+	warp_event  3,  7, LAST_MAP, 1
 
 	def_bg_events
 

data/maps/objects/Route24.asm

@@ -2,6 +2,7 @@ Route24_Object:
 	db $2c ; border block
 
 	def_warp_events
+	warp_event  5,  5, ROUTE_12_SUPER_ROD_HOUSE, 1
 
 	def_bg_events
 
@@ -13,6 +14,7 @@ Route24_Object:
 	object_event 11, 25, SPRITE_YOUNGSTER, STAY, LEFT, 5, OPP_YOUNGSTER, 4
 	object_event 10, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, 6, OPP_LASS, 8
 	object_event 11, 31, SPRITE_YOUNGSTER, STAY, LEFT, 7, OPP_BUG_CATCHER, 9
-	object_event 10,  5, SPRITE_POKE_BALL, STAY, NONE, 8, TM_THUNDER_WAVE
+	object_event 18,  5, SPRITE_POKE_BALL, STAY, NONE, 8, TM_THUNDER_WAVE
+	object_event  9,  5, SPRITE_COOLTRAINER_M, STAY, DOWN, 9 ; Damien
 
 	def_warps_to ROUTE_24

data/text/text_2.asm

@@ -684,6 +684,11 @@ _ViridianBlackboardPoisonText::
 
 	para "Poison lingers"
 	line "after battles."
+	
+	para "If a #MON is"
+	line "badly poisoned,"
+	cont "it could worsen"
+	cont "over time!"
 
 	para "Use an ANTIDOTE"
 	line "to cure poison!"
@@ -693,6 +698,9 @@ _ViridianBlackboardPrlzText::
 	text "Paralysis could"
 	line "make #MON"
 	cont "moves misfire!"
+	
+	para "It even lowers"
+	line "their SPEED!"
 
 	para "Paralysis remains"
 	line "after battles."
@@ -702,8 +710,8 @@ _ViridianBlackboardPrlzText::
 	prompt
 
 _ViridianBlackboardBurnText::
-	text "A burn reduces"
-	line "power and speed."
+	text "A burn reduces a"
+	line "#MON's ATTACK."
 	cont "It also causes"
 	cont "ongoing damage."
 

data/wild/maps/Route24.asm

@@ -2,14 +2,14 @@ Route24WildMons:
 	def_grass_wildmons 25 ; encounter rate
 	db 13, ODDISH
 	db 13, BELLSPROUT
-	db 12, PIDGEY
+	db 12, SPEAROW
 	db 14, ODDISH
 	db 14, BELLSPROUT
 	db 10, ABRA
-	db 13, PIDGEY
-	db 14, PIDGEY
+	db 13, SPEAROW
+	db 14, SPEAROW
 	db 12, ABRA
-	db 16, BUTTERFREE
+	db 16, PIDGEOTTO
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route25.asm

@@ -1,15 +1,15 @@
 Route25WildMons:
 	def_grass_wildmons 15 ; encounter rate
 	db 14, BELLSPROUT
-	db 13, PIDGEY
+	db 13, SPEAROW
 	db 12, VENONAT
 	db 14, ODDISH
 	db 14, ODDISH
 	db 10, ABRA
 	db 13, VENONAT
-	db 14, PIDGEY
+	db 14, SPEAROW
 	db 12, ABRA
-	db 16, BEEDRILL
+	db 16, PIDGEOTTO
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate