Bug fixes

- Fixed a bug where you couldn't walk through one of the Kanto rock tiles
- Fixed a bug where you couldn't go back through the Winner's Path cave exits
- Fixed a bug where some trainers would glitch when walking on Silent Hills mapgroups
- Optimised the Silent Hills spriteset
- Modified Painter Dali and Super Nerd Gregg's teams
- Modified Winners Path's wild data to feature L56 Chanseys for use with the Repel Trick.
- Fixed some text so it scrolls better

data/maps/outdoor_sprites.asm

@@ -698,23 +698,22 @@ SilentHillsGroupSprites:
 	db SPRITE_FAMICOM
 	db SPRITE_POKEDEX
 	db SPRITE_WILL
-	db SPRITE_KAREN
+	db SPRITE_ROCKER
 	db SPRITE_NURSE
-	db SPRITE_OLD_LINK_RECEPTIONIST
+	db SPRITE_FISHER
 	db SPRITE_BIG_LAPRAS
 	db SPRITE_BIG_ONIX
-	db SPRITE_SUPER_NERD
+	db SPRITE_SUDOWOODO
-	db SPRITE_POKEFAN_M
 	db SPRITE_RIVAL
-	db SPRITE_TEACHER
-	db SPRITE_FISHER
 	; 9 walking sprites
 	db SPRITE_COOLTRAINER_M
 	db SPRITE_YOUNGSTER
 	db SPRITE_POKEFAN_F
 	db SPRITE_BEAUTY
 	db SPRITE_BUG_CATCHER
-	db SPRITE_ROCKER
+	db SPRITE_BLUE
+	db SPRITE_POKEFAN_M
+	db SPRITE_SUPER_NERD
 	; 2 non-walking sprites
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE

data/tilesets/cave_collision.asm

@@ -72,7 +72,7 @@
 	tilecoll FLOOR, WALL, FLOOR, WALL ; 47
 	tilecoll FLOOR, FLOOR, WALL, WALL ; 48
 	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 49
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 4a
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 4a
 	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 4b
 	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 4c
 	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 4d
@@ -85,3 +85,4 @@
 	tilecoll WATER, WATER, WATER, WATER ; 54
 	tilecoll WATER, WALL, WATER, WALL ; 55
 	tilecoll WATER, WALL, WALL, WALL ; 56
+	tilecoll WALL, WALL, FLOOR, WARP_CARPET_DOWN ; 57

data/trainers/parties.asm

@@ -3324,9 +3324,9 @@ SuperNerdGroup:
 	next_list_item ; SUPER_NERD (3) 
 	db "GREGG@", TRAINERTYPE_NORMAL
 	db 50
-	dw MAGNEZONE
+	dw ELECTRODE
 	db 51
-	dw MUK
+	dw PORYGON2
 	db 50
 	dw BELLEDAM
 	db -1 ; end

data/trainers/parties_new_classes.asm

@@ -68,6 +68,9 @@ PainterGroup:
 	
 	next_list_item ; PAINTER (1)
 	db "DALI@", TRAINERTYPE_MOVES
+	db 50
+	dw NOCTOWL
+	dw REFLECT, HYPNOSIS, WING_ATTACK, FORESIGHT
 	db 53
 	dw SMEARGLE
 	dw EXTREMESPEED, BELLY_DRUM, NO_MOVE, NO_MOVE ; lol

data/wild/nihon_grass.asm

@@ -6,7 +6,7 @@ NihonGrassWildMons:
 	; morn
 	dbw 50, MUNCHLAX
 	dbw 51, SKARMORY
-	dbw 50, CHANSEY
+	dbw 56, CHANSEY ; Allows a Repel trick. Thanks for the suggestion Molk!
 	dbw 51, MUNCHLAX
 	dbw 52, RHYDON
 	dbw 52, FORRETRESS
@@ -14,7 +14,7 @@ NihonGrassWildMons:
 	; day
 	dbw 50, MUNCHLAX
 	dbw 51, SKARMORY
-	dbw 50, CHANSEY
+	dbw 56, CHANSEY
 	dbw 51, MUNCHLAX
 	dbw 52, RHYDON
 	dbw 52, FORRETRESS

maps/UnnumberedRoute.ablk

@@ -1,6 +1,6 @@
-k))(k)))))))))))(efj''%eeeeeeeeeej'''''''''''%
-






















`










-




TnnnU

ptt]^






"C
"
X555Y‹ŒŒb








"
†"X555Y`bee

eeeee"eeeX555Yeee`


+k))(k)))))))))))(efj''%eeeeeeeeeej'''''''''''%
-






















`










-




TnnnU

ptt]^






"C
"
X555Y‹ŒŒb








"
†"X555Y`bee
eeeeee"eeeX555Yeee`

 
 
 
 
-

nnnnnnnnnnnŠ555Y
+
nnnnnnnnnnnŠ555Y

maps/UnnumberedRoute.asm

@@ -133,5 +133,5 @@ UnnumberedRoute_MapEvents:
 
 	def_object_events
 	object_event 47,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPainterDali, -1
-	object_event 12, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerSuperNerdGregg, -1
+	object_event 10, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerSuperNerdGregg, -1
 	object_event 41,  8, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerFisherBran, -1

maps/WinnersPath.ablk

@@ -2,11 +2,11 @@
 @&%R
 A&1@2'
 ST0U
-A&VN#M









....................







+$&VN#M









....................







 +)K
 )))!
 ))(
-( !+JN#M









....................





+( !+JWN#M









....................





 *E*B
 
 

maps/WinnersPathOutside.ablk

@@ -1 +1 @@
-ƒ

WWW
WWW


ƒWWW
WWWƒ

WW
WWWW

ƒƒW
WWWWWEk))))("l**‚<>%"l**&l**&l**&„l**&l***(l***&l***&l***&j<>''%EWWaƒmC99„WWWpttt…ƒrq{{…E
+ƒ
WWW
WWW


ƒWWW
WWWƒ

WW
WWWW

ƒƒW
WWWWWEk))))("l**‚<>%"l**&l**&l**&„l**&l***(l***&l***&l***&j<>''%EWWaƒmC99„WWWpttt…ƒrq{{…E

maps/WinnersPathOutside.asm

@@ -56,13 +56,13 @@ EngineerDashuBeatenText:
 
 EngineerDashuAfterBattleText:
 	text "There's a huge"
-	line "POWER PLANT"
+	line "POWER PLANT near"
-	cont "near NEW TYPE." ; Change name when necessary.
+	cont "NEW TYPE." ; Change name when necessary.
 	
-	para "Why aren't I"
+	para "Why aren't I there"
-	line "there right"
+	line "right now"
-	cont "now? Aren't"
+	
-	cont "you a nosy"
+	para "Aren't you a nosy"
 	cont "one, eh?"
 	done
 
@@ -119,4 +119,4 @@ WinnersPathOutside_MapEvents:
 
 	def_object_events
 	object_event  6, 48, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerCoolTrainerSteve, -1
-	object_event 10, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerEngineerDashu, -1
+	object_event 10, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerEngineerDashu, -1