Fixes for the demo

Fixed multiple issues for the demo that FrenchOrange pointed out

data/maps/objects/SSAnneB1FRooms.asm

@@ -19,7 +19,7 @@ SSAnneB1FRooms_Object:
 	object_event  0, 13, SPRITE_SAILOR, STAY, DOWN, 1, OPP_SAILOR, 3
 	object_event  2, 11, SPRITE_SAILOR, STAY, DOWN, 2, OPP_SAILOR, 4
 	object_event  2,  1, SPRITE_SUPER_NERD, STAY, DOWN, 3, OPP_ROCKER, 3
-	object_event  0,  3, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, 8
+	object_event  0,  3, SPRITE_HIKER, STAY, RIGHT, 4, OPP_BLACKBELT, 8
 	object_event 22,  2, SPRITE_SAILOR, STAY, RIGHT, 5, OPP_SAILOR, 7
 	object_event 12,  2, SPRITE_FISHER, STAY, RIGHT, 6, OPP_FISHER, 2
 	object_event 10, 13, SPRITE_SUPER_NERD, STAY, RIGHT, 7 ; person

data/maps/town_map_order.asm

@@ -22,8 +22,8 @@ TownMapOrder:
 	db ROUTE_10
 	db ROCK_TUNNEL_POKECENTER
 	db LAVENDER_TOWN
-	db ROUTE_12
 	db POKEMON_TOWER_2F
+	db ROUTE_12
 	db ROUTE_8
 	db ROUTE_7
 	db CELADON_CITY

data/pokemon/base_stats/arbok.asm

@@ -17,7 +17,7 @@
 	tmhm WHIRLWIND,    SLUDGE,       POISON_GAS,   BODY_SLAM,    TAKE_DOWN,    \
 	     DOUBLE_EDGE,  HYPER_BEAM,   MEGA_DRAIN,   DRAGON_RAGE,  EARTHQUAKE,   \
 	     FISSURE,      DIG,          MIMIC,        DOUBLE_TEAM,  BIDE,         \
-	     REST,         CONSTRICT,    SUBSTITUTE,   STRENGTH      
+	     REST,         CONSTRICT,    SUBSTITUTE,   STRENGTH,     FLASH         
 	; end
 
 

data/pokemon/base_stats/ekans.asm

@@ -17,7 +17,7 @@
 	tmhm WHIRLWIND,    SLUDGE,       POISON_GAS,   BODY_SLAM,    TAKE_DOWN,    \
 	     DOUBLE_EDGE,  MEGA_DRAIN,   EARTHQUAKE,   FISSURE,      DIG,          \
 	     MIMIC,        DOUBLE_TEAM,  BIDE,         REST,         CONSTRICT,    \
-	     SUBSTITUTE,   STRENGTH      
+	     SUBSTITUTE,   STRENGTH,     FLASH         
 	; end
 
 	db 0 ; padding

data/tilesets/collision_tile_ids.asm

@@ -24,15 +24,15 @@ Gym_Coll::
 	coll_tiles $11, $16, $19, $2b, $3c, $3d, $3f, $4a, $4c, $4d, $03
 
 Forest_Coll::
-	coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f
+	coll_tiles $10, $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f
 
 House_Coll::
 	coll_tiles $01, $12, $14, $28, $32, $37, $44, $54, $5c
 
 ForestGate_Coll::
 Museum_Coll::
 Gate_Coll::
-	coll_tiles $01, $12, $14, $1a, $1c, $34, $37, $38, $3b, $3c, $5e
+	coll_tiles $01, $12, $14, $1a, $1c, $37, $38, $3b, $3c, $5e
 
 Ship_Coll::
 	coll_tiles $04, $0d, $17, $1d, $1e, $23, $34, $37, $39, $4a

data/wild/good_rod.asm

@@ -3,7 +3,7 @@ GoodRodData:
 	; map, fishing group
 	dbw PALLET_TOWN,         .Group7
 	dbw VIRIDIAN_CITY,       .Group1
-	dbw PEWTER_CITY,         .Group6
+	dbw PEWTER_CITY,         .Group2
 	dbw CERULEAN_CITY,       .Group2
 	dbw VERMILION_CITY,      .Group4
 	dbw CELADON_CITY,        .Group5

data/wild/maps/PokemonTower3F.asm

@@ -1,9 +1,9 @@
 PokemonTower3FWildMons:
 	def_grass_wildmons 10 ; encounter rate
 	db 23, GASTLY
-	db 22, CLEFAIRY
+	db 23, CLEFAIRY
 	db 23, GASTLY
-	db 24, CLEFAIRY
+	db 22, CLEFAIRY
 	db 23, VULPIX
 	db 22, GRIMER
 	db 24, GASTLY

data/wild/maps/PokemonTower4F.asm

@@ -1,9 +1,9 @@
 PokemonTower4FWildMons:
 	def_grass_wildmons 10 ; encounter rate
 	db 24, GASTLY
-	db 23, CLEFAIRY
+	db 24, CLEFAIRY
 	db 24, GASTLY
-	db 25, CLEFAIRY
+	db 23, CLEFAIRY
 	db 24, VULPIX
 	db 23, GRIMER
 	db 24, LICKITUNG

data/wild/maps/PokemonTower5F.asm

@@ -1,12 +1,12 @@
 PokemonTower5FWildMons:
 	def_grass_wildmons 10 ; encounter rate
 	db 25, GASTLY
-	db 24, CLEFAIRY
+	db 25, CLEFAIRY
 	db 26, GASTLY
 	db 25, LICKITUNG
 	db 25, VULPIX
 	db 24, GRIMER
-	db 26, CLEFAIRY
+	db 24, CLEFAIRY
 	db 27, HAUNTER
 	db 26, CLEFAIRY
 	db 26, CLEFAIRY

data/wild/maps/PokemonTower6F.asm

@@ -1,12 +1,12 @@
 PokemonTower6FWildMons:
 	def_grass_wildmons 15 ; encounter rate
 	db 26, GASTLY
-	db 25, CLEFAIRY
+	db 26, CLEFAIRY
 	db 26, LICKITUNG
 	db 28, HAUNTER
 	db 26, VULPIX
 	db 25, GRIMER
-	db 27, CLEFAIRY
+	db 25, CLEFAIRY
 	db 27, CLEFAIRY
 	db 27, CLEFAIRY
 	db 27, CLEFAIRY

data/wild/maps/PokemonTower7F.asm

@@ -1,13 +1,13 @@
 PokemonTower7FWildMons:
 	def_grass_wildmons 15 ; encounter rate
 	db 26, CLEFAIRY
-	db 27, LICKITUNG
+	db 26, LICKITUNG
 	db 29, HAUNTER
 	db 27, GASTLY
 	db 27, VULPIX
 	db 26, GRIMER
 	db 28, CLEFAIRY
-	db 30, CLEFABLE
+	db 25, GASTLY
 	db 32, NINETALES
 	db 34, GENGAR
 	end_grass_wildmons

data/wild/maps/Route22.asm

@@ -1,11 +1,11 @@
 Route22WildMons:
 	def_grass_wildmons 25 ; encounter rate
 	db  3, SPEAROW
-	db  4, SPEAROW
+	db  3, RATTATA
 	db  3, MANKEY
-	db  3, RATTATA 
+	db  4, SPEAROW
 	db  4, RATTATA
-	db  5, RATTATA
+	db  5, SPEAROW
 	db  5, MANKEY
 	db  3, VULPIX
 	db  4, VULPIX

data/wild/old_rod.asm

@@ -3,7 +3,7 @@ OldRodData:
 	; map, fishing group
 	dbw PALLET_TOWN,         .Group7
 	dbw VIRIDIAN_CITY,       .Group1
-	dbw PEWTER_CITY,         .Group6
+	dbw PEWTER_CITY,         .Group2
 	dbw CERULEAN_CITY,       .Group2
 	dbw VERMILION_CITY,      .Group4
 	dbw CELADON_CITY,        .Group5

maps/CeruleanCity.blk

@@ -14,4 +14,4 @@ tN\	 !
 t|r
 

 










/\bQQN

-tttttt

111_{NttN

 !




 !ttt_{NttN
V|~
x
|s0	_{NttN




eCd





_{Nttbllll6eCdV2llll{NttN{{{{{{{{{{{{{{{{NttPRRm]n/N]MRRRRNtttttm'nttttN'Mttttt
+tttttt

111_{NttN

 !




 !ttt_{NttN
V|~

|s0	_{NttN




eCd





_{Nttbllll6eCdV2llll{NttN{{{{{{{{{{{{{{{{NttPRRm]n/N]MRRRRNtttttm'nttttN'Mttttt

maps/VermilionCity.blk

@@ -1 +1 @@
-CCC ! ! !1 !11111111kk|~|r7~17~wVwww111Cd1111111111111111C-111111111111CCC-111111111CCC !C !11 !111111Cd|~1|~11|swwwwVwCd1111111111111111Cd11111 !jTgCdV51|~edTeCCCCd11111ed111e-T.CCCCd11111e-.CTCdC-.CCCCCCTCdCCCCCCCCTTTTTTTCdCCCCCCCCTxxxxxxC-gkkkkkkkSTSkkkkkkkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
+CCC ! ! !1 !11111111kk|~|r7~17~wVwww111Cd1111111111111111C-111111111111CCC-111111111CCC !C !11 !111111Cd|~1|~11|swwwwVwCd1111111111111111Cd11111 !jTgCdV51|~edTeCCCCd11111ed111e-T.CCCCd11111e-.CTdC-.CCCCCCTdCCCCCCCCTTTTTTTdCCCCCCCCTxxxxxx-jkkkkkkkSTSkkkkkkCCCCCCCCCCCCCCCCdCCCCCCCCCCCCCCCCd

text/CeladonCity.asm

@@ -1,6 +1,6 @@
 _CeladonCityText1::
 	text "I got my KOFFING"
-	line "in ROUTE 10!"
+	line "on Route 10!"
 
 	para "It's nice, but it"
 	line "breathes poison"

text/CeladonMansion2F.asm

@@ -17,6 +17,7 @@ _CeladonMansion2Text1::
 	para "Special thanks to"
 	line "Rangi42, 33Dannye,"
 	cont "Drush, Chatot4444,"
+	cont "FrenchOrange,"
 	cont "and many more"
 	cont "over the PRET"
 	cont "discord server!"

text/CeladonMansion3F.asm

@@ -2,7 +2,7 @@ _ProgrammerText::
 	text "Me? I'm the"
 	line "programmer!"
 	cont "Dont blame me on"
-	cont "the spaguetti"
+	cont "the spaghetti"
 	cont "code I was young"
 	cont "and naive!"
 	done
@@ -13,7 +13,7 @@ _GraphicArtistText::
 	cont "Everyone thinks"
 	cont "they can do"
 	cont "better than I did"
-	cont "on 1996!"
+	cont "in 1996!"
 	done
 
 _WriterText::

text/CeladonMart3F.asm

@@ -51,11 +51,10 @@ _CeladonMart3Text4::
 	para "I love GRAVELER!"
 	line "I collect them!"
 
-	para "Huh?"
-
-	para "GRAVELER didn't"
-	line "evolve into a "
-	cont "diferent #MON?"
+	para "GOLEM looks ugly!"
+	line "But GRAVELER are"
+	cont "cool, I'll never"
+	cont "evolve them!"
 	done
 
 _CeladonMart3Text5::

text/CeruleanCity.asm

@@ -109,7 +109,7 @@ _CeruleanCityText3::
 
 _CeruleanCityText4::
 	text "That bush in"
-	line "front of the shop"
+	line "front of the mart"
 	cont "is in the way."
 
 	para "There might be a"

text/CeruleanGym.asm

@@ -67,15 +67,15 @@ _ReceivedSnowBadgeText::
 	text_end
 
 _CeruleanGymBattleText1::
-	text "I'm more than good"
-	line "enough for you!"
+	text "I'm cool enough"
+	line "for you!"
 
 	para "MISTY can wait!"
 	done
 
 _CeruleanGymEndBattleText1::
 	text "You"
-	line "overwhelmed me!"
+	line "defrosted me!"
 	prompt
 
 _CeruleanGymAfterBattleText1::
@@ -86,10 +86,11 @@ _CeruleanGymAfterBattleText1::
 	done
 
 _CeruleanGymBattleText2::
-	text "Splash!"
+	text "Splash! "
 
-	para "I'm first up!"
-	line "Let's do it!"
+	para "Nothing beats ice"
+	line "cold baths!"
+	cont "Now let's battle!"
 	done
 
 _CeruleanGymEndBattleText2::
@@ -106,10 +107,12 @@ _CeruleanGymAfterBattleText2::
 	done
 
 _CeruleanGymGuidePreBattleText::
-	text "Yo! Champ in"
-	line "making!"
+	text "Champ in making!"
+	line "Im freezing righ"
+	cont "here!"
 
-	para "Here's my advice!"
+	para "Here's some cold"
+	cont "advice!"
 
 	para "The LEADER, MISTY,"
 	line "is a pro who uses"

text/PewterCity.asm

@@ -1,11 +1,12 @@
 _PewterCityText1::
-	text "It's rumored that"
-	line "CLEFAIRYs came"
-	cont "from the moon!"
-
-	para "They appeared "
-	line "after MOON STONE"
-	cont "fell on MT.MOON."
+	text "I've heard that"
+	line "when CLEFAIRYs"
+	cont "evolve, they turn"
+	cont "into ghosts."
+
+	para "I always though"
+	line "they were just"
+	cont "moon fairies!"
 	done
 
 _PewterCityText2::

text/Route2.asm

@@ -1,6 +1,6 @@
 _Route2BattleText1::
 	text "Hello, are you a"
-	line "#MON Trainer?"
+	line "#MON trainer?"
 	done
 
 _Route2EndBattleText1::
@@ -13,7 +13,7 @@ _Route2AfterBattleText1::
 	line "own adventure"
 	cont "yesterday"
 
-	para "POKEMON are"
+	para "#MON are"
 	line "fantastic!"
 	done
 
@@ -29,8 +29,8 @@ _Route2EndBattleText2::
 
 _Route2AfterBattleText2::
 	text "I'm training to "
-	line "defeat BROCK on"
-	cont "PEWTER GYM"
+	line "defeat BROCK over"
+	cont "at PEWTER GYM."
 
 	para "He's a really"
 	line "tough trainer!"

text/Route8.asm

@@ -141,8 +141,8 @@ _Route8EndBattleText9::
 	prompt
 
 _Route8AfterBattleText9::
-	text "I heard that"
-	line "CLEFAIRY evolves"
+	text "I heard CLEFAIRY"
+	line "can evolve"
 	cont "when it's exposed"
 	cont "to a MOON STONE."
 	done

text/SSAnne2FRooms.asm

@@ -35,8 +35,8 @@ _SSAnne9Text_61c2e::
 	cont "ZONE is awesome!"
 
 	para "It is a bit dark"
-	line "but there #MON"
-	cont "are peaceful"
+	line "but the #MON"
+	cont "there are docile."
 	done
 
 _SSAnne9Text_61c3d::

text/SSAnneB1FRooms.asm

@@ -32,7 +32,7 @@ _SSAnne10EndBattleText2::
 _SSAnne10AfterBattleText2::
 	text "Did you see the"
 	line "FISHING GURU in"
-	cont "VERMILION CITY?"
+	cont "LAVENDER TOWN?"
 	done
 
 _SSAnne10BattleText3::
@@ -54,8 +54,8 @@ _SSAnne10AfterBattleText3::
 _SSAnne10BattleText4::
 	text "Hey, back off kid,"
 	line "this aint the"
-	cont "backstage"
-	text_end
+	cont "backstage!"
+	done
 
 _SSAnne10EndBattleText4::
 	text "No"

text/VermilionGym_2.asm

@@ -127,16 +127,16 @@ _VermilionGymGuidePreBattleText::
 	para "LT.SURGE has a"
 	line "nickname. People"
 	cont "refer to him as"
-	cont "the Lightning"
+	cont "the Burning"
 	cont "American!"
 
 	para "He's an expert on"
-	line "electric #MON!"
+	line "fire #MON!"
 
-	para "Birds and water"
+	para "Bugs and grass"
 	line "#MON are at"
 	cont "risk! Beware of"
-	cont "paralysis too!"
+	cont "burns too!"
 
 	para "LT.SURGE is very"
 	line "cautious!"
@@ -148,5 +148,5 @@ _VermilionGymGuidePreBattleText::
 
 _VermilionGymGuidePostBattleText::
 	text "Whew! That match"
-	line "was electric!"
+	line "was flaming hot!"
 	done