A few fixes + added Blahaj cameo

Copycat now has a Jagg plushie in her house, referencing the amazing IKEA shark.

(note that KEP is not sponsored by IKEA)

README.md

@@ -134,6 +134,7 @@ Known Bugs
 - Some sprites in the Celadon University area spawn bugged out on certain emulators.
 - Battling multiple of the trainers in Celadon University causes a crash when attempting to go to Route 16
 - The lone Rocket in Viridian Gym's basement needs to be directly spoken to to be battled
+- Faraway Island Inside can't be entered
 
 Credits
 ====
@@ -144,10 +145,10 @@ Credits
 * ausma - Showdown Mod assistance
 * Paulluxx - Showdown Mod assistance
 * DuoM2 - Showdown Mod assistance 
-* Albatross - Much of the new sprites used in the hack 
+* Albatross - Several of the new sprites used in the hack (Electivire, Magmortar, Rhyperior, Tangrowth, Glaceon, Sylveon...)
 * ZumiIsawhat? - Restorations of beta OST
 * Helix Chamber, RacieBeep, et al - Prototype Pokémon sprites
-* Vortyne - Reused a bit of code from their pureRGB hack, which was used to assist with the eventual final Mew encounter.
+* Vortyne - Reused a bit of code from their pureRGB hack, which was used to assist with making MissingNo. stable.
 * Rangi - Reused a bit of code from their Red* / Blue* hack to make HMs usable in the overworld!
 
 Original README.md proceeding;

constants/map_constants.asm

@@ -88,16 +88,16 @@ DEF FIRST_INDOOR_MAP EQU const_value
 	mapconst BIKE_SHOP,                      4,  4 ; $42
 	mapconst CERULEAN_MART,                  4,  4 ; $43
 	mapconst MT_MOON_POKECENTER,             4,  7 ; $44
-	mapconst CERULEAN_TRASHED_HOUSE_COPY,    4,  4 ; $45	; Unused
+	mapconst CERULEAN_TRASHED_HOUSE_COPY,    4,  4 ; $45	- Unused
 	mapconst ROUTE_5_GATE,                   3,  4 ; $46
 	mapconst UNDERGROUND_PATH_ROUTE_5,       4,  4 ; $47
 	mapconst DAYCARE,                        4,  4 ; $48
 	mapconst ROUTE_6_GATE,                   3,  4 ; $49
 	mapconst UNDERGROUND_PATH_ROUTE_6,       4,  4 ; $4A
-	mapconst UNDERGROUND_PATH_ROUTE_6_COPY,  4,  4 ; $4B	; Unused
+	mapconst UNDERGROUND_PATH_ROUTE_6_COPY,  4,  4 ; $4B	- Unused
 	mapconst ROUTE_7_GATE,                   4,  3 ; $4C
 	mapconst UNDERGROUND_PATH_ROUTE_7,       4,  4 ; $4D
-	mapconst UNDERGROUND_PATH_ROUTE_7_COPY,  4,  4 ; $4E	; Unused
+	mapconst UNDERGROUND_PATH_ROUTE_7_COPY,  4,  4 ; $4E	- Unused
 	mapconst ROUTE_8_GATE,                   4,  3 ; $4F
 	mapconst UNDERGROUND_PATH_ROUTE_8,       4,  4 ; $50
 	mapconst ROCK_TUNNEL_POKECENTER,         4,  7 ; $51
@@ -124,19 +124,19 @@ DEF FIRST_INDOOR_MAP EQU const_value
 	mapconst SS_ANNE_1F_ROOMS,               8, 12 ; $66
 	mapconst SS_ANNE_2F_ROOMS,               8, 12 ; $67
 	mapconst SS_ANNE_B1F_ROOMS,              8, 12 ; $68
-	mapconst SILPH_GAUNTLET_1F,              9, 10 ; $69	; Gauntlet Floor 1: Viridian Forest
+	mapconst SILPH_GAUNTLET_1F,              9, 10 ; $69	- Was UNUSED_MAP_69
-	mapconst SILPH_GAUNTLET_2F,             10, 13 ; $6A	; Gauntlet Floor 2: Mt. Moon
+	mapconst SILPH_GAUNTLET_2F,             10, 13 ; $6A	- Was UNUSED_MAP_6A
-	mapconst SILPH_GAUNTLET_3F,             13, 17 ; $6B	; Gauntlet Floor 3: S.S. Anne
+	mapconst SILPH_GAUNTLET_3F,             13, 17 ; $6B	- Was UNUSED_MAP_6B
 	mapconst VICTORY_ROAD_1F,                9, 10 ; $6C
-	mapconst SILPH_GAUNTLET_4F,              9, 10 ; $6D	; Gauntlet Floor 4: Lavender Tower
+	mapconst SILPH_GAUNTLET_4F,              9, 10 ; $6D	- Was UNUSED_MAP_6D
-	mapconst SILPH_GAUNTLET_5F,              9, 10 ; $6E	; Gauntlet Floor 5: Safari Zone
+	mapconst SILPH_GAUNTLET_5F,              9, 10 ; $6E	- Was UNUSED_MAP_6E
-	mapconst SILPH_GAUNTLET_6F,             12, 12 ; $6F	; Gauntlet Floor 6: Pokemon Mansion
+	mapconst SILPH_GAUNTLET_6F,             12, 12 ; $6F	- Was UNUSED_MAP_6F
-	mapconst SILPH_GAUNTLET_7F,              5,  6 ; $70	; Gauntlet Floor 7: Chief's Office
+	mapconst SILPH_GAUNTLET_7F,              5,  6 ; $70	- Was UNUSED_MAP_70
 	mapconst LANCES_ROOM,                   13, 13 ; $71
-	mapconst FARAWAY_ISLAND_OUTSIDE,                  18,  15 ; $72	; Unused UNUSED_MAP_72
+	mapconst FARAWAY_ISLAND_OUTSIDE,       18,  15 ; $72	- Was UNUSED_MAP_72
-	mapconst FARAWAY_ISLAND_INSIDE,                  11,  15 ; $73	; Unused UNUSED_MAP_73
+	mapconst FARAWAY_ISLAND_INSIDE,        11,  15 ; $73	- Was UNUSED_MAP_73
-	mapconst POKEMON_MANSION_B2F,                  12,  15 ; $74	; Unused UNUSED_MAP_74
+	mapconst POKEMON_MANSION_B2F,          12,  15 ; $74	- Was UNUSED_MAP_74
-	mapconst UNUSED_MAP_75,                  0,  0 ; $75	; Unused
+	mapconst UNUSED_MAP_75,                  0,  0 ; $75	- Unused
 	mapconst HALL_OF_FAME,                   4,  5 ; $76
 	mapconst UNDERGROUND_PATH_NORTH_SOUTH,  24,  4 ; $77
 	mapconst CHAMPIONS_ROOM,                 4,  4 ; $78
@@ -163,9 +163,9 @@ DEF FIRST_INDOOR_MAP EQU const_value
 	mapconst LAVENDER_POKECENTER,            4,  7 ; $8D
 	mapconst POKEMON_TOWER_1F,               9, 10 ; $8E
 	mapconst POKEMON_TOWER_2F,               9, 10 ; $8F
-	mapconst POKEMON_TOWER_3F,               9, 10 ; $90	; Unused
+	mapconst POKEMON_TOWER_3F,               9, 10 ; $90	- Now unused
-	mapconst POKEMON_TOWER_4F,               9, 10 ; $91	; Unused
+	mapconst POKEMON_TOWER_4F,               9, 10 ; $91	- Now unused
-	mapconst POKEMON_TOWER_5F,               9, 10 ; $92	; Unused
+	mapconst POKEMON_TOWER_5F,               9, 10 ; $92	- Now unused
 	mapconst POKEMON_TOWER_6F,               9, 10 ; $93
 	mapconst POKEMON_TOWER_7F,               9, 10 ; $94
 	mapconst MR_FUJIS_HOUSE,                 4,  4 ; $95
@@ -182,7 +182,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
 	mapconst SEAFOAM_ISLANDS_B2F,            9, 15 ; $A0
 	mapconst SEAFOAM_ISLANDS_B3F,            9, 15 ; $A1
 	mapconst SEAFOAM_ISLANDS_B4F,            9, 15 ; $A2
-	mapconst VERMILION_OLD_ROD_HOUSE,        4,  4 ; $A3
+	mapconst VERMILION_OLD_ROD_HOUSE,        4,  4 ; $A3	- Now unused
 	mapconst FUCHSIA_GOOD_ROD_HOUSE,         4,  4 ; $A4
 	mapconst POKEMON_MANSION_1F,            14, 15 ; $A5
 	mapconst CINNABAR_GYM,                   9, 10 ; $A6
@@ -192,7 +192,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
 	mapconst CINNABAR_LAB_FOSSIL_ROOM,       4,  4 ; $AA
 	mapconst CINNABAR_POKECENTER,            4,  7 ; $AB
 	mapconst CINNABAR_MART,                  4,  4 ; $AC
-	mapconst CINNABAR_MART_COPY,             4,  4 ; $AD	; Unused
+	mapconst CINNABAR_MART_COPY,             4,  4 ; $AD	- Unused
 	mapconst INDIGO_PLATEAU_LOBBY,           6,  8 ; $AE
 	mapconst COPYCATS_HOUSE_1F,              4,  4 ; $AF
 	mapconst COPYCATS_HOUSE_2F,              4,  4 ; $B0
@@ -219,13 +219,13 @@ DEF FIRST_INDOOR_MAP EQU const_value
 	mapconst DIGLETTS_CAVE,                 18, 20 ; $C5
 	mapconst VICTORY_ROAD_3F,                9, 15 ; $C6
 	mapconst ROCKET_HIDEOUT_B1F,            14, 11 ; $C7
-	mapconst ROCKET_HIDEOUT_B2F,            14, 15 ; $C8	; Unused, Citrine PokeCenter?
+	mapconst ROCKET_HIDEOUT_B2F,            14, 15 ; $C8	- Now unused, Citrine PokeCenter?
-	mapconst ROCKET_HIDEOUT_B3F,            14, 15 ; $C9	; Unused, Citrine PokeMart?
+	mapconst ROCKET_HIDEOUT_B3F,            14, 15 ; $C9	- Now unused, Citrine PokeMart?
-	mapconst ROCKET_HIDEOUT_B4F,            12, 15 ; $CA	; Unused, Citrine House 1?
+	mapconst ROCKET_HIDEOUT_B4F,            12, 15 ; $CA	- Now unused, Citrine House 1?
-	mapconst ROCKET_HIDEOUT_ELEVATOR,        4,  3 ; $CB	; Unused, Citrine House 2?
+	mapconst ROCKET_HIDEOUT_ELEVATOR,        4,  3 ; $CB	- Now unused, Citrine Dock?
-	mapconst UNUSED_MAP_CC,                  0,  0 ; $CC	; Unused, Citrine Dock?
+	mapconst UNUSED_MAP_CC,                  0,  0 ; $CC	- Unused, Citrine House 2?
-	mapconst UNUSED_MAP_CD,                  0,  0 ; $CD	; Unused, Citrine Cave 1F?
+	mapconst UNUSED_MAP_CD,                  0,  0 ; $CD	- Unused, Citrine Cave 1F?
-	mapconst UNUSED_MAP_CE,                  0,  0 ; $CE	; Unused, Citrine Cave B1F?
+	mapconst UNUSED_MAP_CE,                  0,  0 ; $CE	- Unused, Citrine Cave B1F?
 	mapconst SILPH_CO_2F,                    9, 15 ; $CF
 	mapconst SILPH_CO_3F,                    9, 15 ; $D0
 	mapconst SILPH_CO_4F,                    9, 15 ; $D1
@@ -250,23 +250,23 @@ DEF FIRST_INDOOR_MAP EQU const_value
 	mapconst CERULEAN_CAVE_1F,               9, 15 ; $E4
 	mapconst NAME_RATERS_HOUSE,              4,  4 ; $E5
 	mapconst CERULEAN_BADGE_HOUSE,           4,  4 ; $E6
-	mapconst CINNABAR_VOLCANO,              12, 14 ; $E7 - was UNUSED_MAP_E7
+	mapconst CINNABAR_VOLCANO,              12, 14 ; $E7	- Was UNUSED_MAP_E7
 	mapconst ROCK_TUNNEL_B1F,               18, 20 ; $E8
 	mapconst SILPH_CO_9F,                    9, 13 ; $E9
 	mapconst SILPH_CO_10F,                   9,  8 ; $EA
 	mapconst SILPH_CO_11F,                   9,  9 ; $EB
 	mapconst SILPH_CO_ELEVATOR,              2,  2 ; $EC
-	mapconst UNUSED_MAP_ED,                  0,  0 ; $ED	; Unused
+	mapconst UNUSED_MAP_ED,                  0,  0 ; $ED	- Unused
-	mapconst UNUSED_MAP_EE,                  0,  0 ; $EE	; Unused
+	mapconst UNUSED_MAP_EE,                  0,  0 ; $EE	- Unused
 	mapconst TRADE_CENTER,                   4,  5 ; $EF
 	mapconst COLOSSEUM,                      4,  5 ; $F0
-	mapconst CELADON_UNIVERSITY_OUTSIDE,    20, 21 ; $F1 - was UNUSED_MAP_F1
+	mapconst CELADON_UNIVERSITY_OUTSIDE,    20, 21 ; $F1	- Was UNUSED_MAP_F1
-	mapconst CELADON_UNIVERSITY_INSIDE,     10, 11 ; $F2 - was UNUSED_MAP_F2
+	mapconst CELADON_UNIVERSITY_INSIDE,     10, 11 ; $F2	- Was UNUSED_MAP_F2
-	mapconst CELADON_UNIVERSITY_POKECENTER,  4,  7 ; $F3 - was UNUSED_MAP_F3
+	mapconst CELADON_UNIVERSITY_POKECENTER,  4,  7 ; $F3	- Was UNUSED_MAP_F3
-	mapconst UNUSED_MAP_F4,                  0,  0 ; $F4	; Unused, Bill's Garden
+	mapconst UNUSED_MAP_F4,                  0,  0 ; $F4	- Unused, will be Bill's Garden
 	mapconst LORELEIS_ROOM,                  6,  5 ; $F5
 	mapconst BRUNOS_ROOM,                    6,  5 ; $F6
-	mapconst AGATHAS_ROOM,                   6,  5 ; $F7	; Maps F8 - FE currently have no data
+	mapconst AGATHAS_ROOM,                   6,  5 ; $F7	- Maps F8 - FE currently have no data
 DEF NUM_MAPS EQU const_value
 
 ; Indoor maps, such as houses, use this as the Map ID in their exit warps

data/maps/objects/CopycatsHouse2F.asm

@@ -10,9 +10,9 @@ CopycatsHouse2F_Object:
 
 	def_object_events
 	object_event  4,  3, SPRITE_BRUNETTE_GIRL, WALK, ANY_DIR, 1 ; person
-	object_event  4,  6, SPRITE_BIRD, WALK, LEFT_RIGHT, 2 ; person
+	object_event  0,  6, SPRITE_SEEL, STAY, RIGHT, 2 ; person
 	object_event  5,  1, SPRITE_MONSTER, STAY, DOWN, 3 ; person
 	object_event  2,  0, SPRITE_BIRD, STAY, DOWN, 4 ; person
-	object_event  1,  6, SPRITE_FAIRY, STAY, RIGHT, 5 ; person
+	object_event  4,  6, SPRITE_FAIRY, STAY, LEFT, 5 ; person
 
 	def_warps_to COPYCATS_HOUSE_2F

data/maps/objects/FarawayIslandOutside.asm

@@ -2,8 +2,8 @@ FarawayIslandOutside_Object:
 	db $2d ; border block
 
 	def_warp_events
-	warp_event  2, 35, VERMILION_CITY, 11
+	warp_event  2, 35, VERMILION_CITY, 10
-	warp_event  3, 35, VERMILION_CITY, 10
+	warp_event  3, 35, VERMILION_CITY, 9
 	warp_event 14, 12, FARAWAY_ISLAND_INSIDE, 1
 	warp_event 15, 12, FARAWAY_ISLAND_INSIDE, 2
 

data/maps/objects/PewterCity.asm

@@ -9,7 +9,7 @@ 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 27, 21, ROUTE_12_SUPER_ROD_HOUSE, 1
+	warp_event  7, 11, ROUTE_12_SUPER_ROD_HOUSE, 1
 
 	def_bg_events
 	bg_event 19, 29,  6 ; PewterCityText6

data/maps/objects/Route6.asm

@@ -5,8 +5,10 @@ Route6_Object:
 	warp_event  9,  1, ROUTE_6_GATE, 3
 	warp_event 10,  1, ROUTE_6_GATE, 3
 	warp_event 10,  7, ROUTE_6_GATE, 1
+	warp_event 17, 13, UNDERGROUND_PATH_ROUTE_6, 1
 
 	def_bg_events
+	bg_event 19, 15, 7 ; Route6Text7
 
 	def_object_events
 	object_event 10, 21, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4

data/maps/objects/Route8.asm

@@ -6,8 +6,10 @@ Route8_Object:
 	warp_event  1, 10, ROUTE_8_GATE, 2
 	warp_event  8,  9, ROUTE_8_GATE, 3
 	warp_event  8, 10, ROUTE_8_GATE, 4
+	warp_event 13,  3, UNDERGROUND_PATH_ROUTE_8, 1
 
 	def_bg_events
+	bg_event 17,  3, 10 ; Route8Text10
 
 	def_object_events
 	object_event  8,  5, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 3

data/maps/objects/UndergroundPathNorthSouth.asm

@@ -4,7 +4,7 @@ UndergroundPathNorthSouth_Object:
 	def_warp_events
 	warp_event  5,  4, UNDERGROUND_PATH_ROUTE_5, 3
 	warp_event  2, 41, UNDERGROUND_PATH_ROUTE_6, 3
-	warp_event  2, 25, UNDERGROUND_PATH_ROUTE_7, 2
+	warp_event  2, 25, UNDERGROUND_PATH_ROUTE_7, 3
 
 	def_bg_events
 

data/maps/objects/UndergroundPathRoute7.asm

@@ -4,12 +4,11 @@ UndergroundPathRoute7_Object:
 	def_warp_events
 	warp_event  3,  7, LAST_MAP, 5
 	warp_event  4,  7, LAST_MAP, 5
-	warp_event  6,  2, UNDERGROUND_PATH_WEST_EAST, 1
+	warp_event  4,  4, UNDERGROUND_PATH_WEST_EAST, 1
-	warp_event  1,  3, UNDERGROUND_PATH_NORTH_SOUTH, 2
 
 	def_bg_events
 
 	def_object_events
-	object_event  3,  3, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 1 ; person
+	object_event  2,  4, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 1 ; person
 
 	def_warps_to UNDERGROUND_PATH_ROUTE_7

data/maps/objects/VermilionCity.asm

@@ -10,7 +10,6 @@ VermilionCity_Object:
 	warp_event 18, 31, VERMILION_DOCK, 1
 	warp_event 19, 31, VERMILION_DOCK, 1
 	warp_event 15, 13, VERMILION_TRADE_HOUSE, 1
-	warp_event  7,  3, VERMILION_OLD_ROD_HOUSE, 1
 	warp_event 10, 31, FARAWAY_ISLAND_OUTSIDE, 2
 	warp_event 11, 31, FARAWAY_ISLAND_OUTSIDE, 1
 

data/pokemon/base_stats/missingno.asm

@@ -1,6 +1,6 @@
 	db DEX_MISSINGNO ; pokedex id
 
-	db 211, 157,  53,  31,  47
+	db 211, 157,  53,  29,  73
 	;   hp  atk  def  spd  spc
 
 	db BIRD, NORMAL ; type
@@ -10,21 +10,17 @@
 	INCBIN "gfx/pokemon/front/missingno.pic", 0, 1 ; sprite dimensions
 	dw MissingNoPicFront, MissingNoPicBack
 
-	db WATER_GUN, WATER_GUN, SKY_ATTACK, NO_MOVE ; level 1 learnset
+	db WATER_GUN, WATER_GUN, SKY_ATTACK, PAY_DAY ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
-	tmhm MEGA_PUNCH,   RAZOR_WIND,   SWORDS_DANCE, WHIRLWIND,    MEGA_KICK,    \
+	tmhm MEGA_PUNCH,   RAZOR_WIND,   SWORDS_DANCE, MEGA_KICK,    TOXIC,		   \
-	     TOXIC,        HORN_DRILL,   BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  \
+	     TAKE_DOWN,    DOUBLE_EDGE,  BUBBLEBEAM,   WATER_GUN,	 ICE_BEAM,     \
-	     BUBBLEBEAM,   WATER_GUN,    ICE_BEAM,     BLIZZARD,     HYPER_BEAM,   \
+	     BLIZZARD,     HYPER_BEAM,   PAY_DAY,      SUBMISSION,   SEISMIC_TOSS, \
-	     PAY_DAY,      SUBMISSION,   COUNTER,      SEISMIC_TOSS, RAGE,         \
+	     RAGE,         THUNDERBOLT,  THUNDER,      EARTHQUAKE,   FISSURE,      \
-	     MEGA_DRAIN,   SOLARBEAM,    DRAGON_RAGE,  THUNDERBOLT,  THUNDER,      \
+	     PSYCHIC_M,    TELEPORT,     MIMIC,        DOUBLE_TEAM,  REFLECT,      \
-	     EARTHQUAKE,   FISSURE,      DIG,          PSYCHIC_M,    TELEPORT,     \
+	     BIDE,         SWIFT,        SKY_ATTACK,   REST,         THUNDER_WAVE, \
-	     MIMIC,        DOUBLE_TEAM,  REFLECT,      BIDE,         METRONOME,    \
+	     TRI_ATTACK,   SUBSTITUTE,   CUT,          FLY,          SURF
-	     SELFDESTRUCT, EGG_BOMB,     FIRE_BLAST,   SWIFT,        SKULL_BASH,   \
-	     SOFTBOILED,   DREAM_EATER,  SKY_ATTACK,   REST,         THUNDER_WAVE, \
-	     PSYWAVE,      EXPLOSION,    ROCK_SLIDE,   TRI_ATTACK,   SUBSTITUTE,   \
-	     CUT,          FLY,          SURF,         STRENGTH,     FLASH
 	; end
 
 	db BANK(MissingNoPicFront)

data/pokemon/menu_icons.asm

@@ -1,6 +1,5 @@
 MonPartyData:
 	nybble_array MonPartyData
-	nybble ICON_MON       ; MissingNo.
 	nybble ICON_GRASS     ; Bulbasaur
 	nybble ICON_GRASS     ; Ivysaur
 	nybble ICON_GRASS     ; Venusaur
@@ -218,4 +217,4 @@ MonPartyData:
 	nybble ICON_SNAKE     ; Dragonite
 	nybble ICON_MON       ; Mewtwo
 	nybble ICON_MON       ; Mew
-	end_nybble_array NUM_POKEMON
+	end_nybble_array NUM_POKEMON - 1

engine/gfx/mon_icons.asm

@@ -262,6 +262,7 @@ GetPartyMonSpriteID:
 	predef IndexToPokedex
 	ld a, [wd11e]
 	ld c, a
+	dec a
 	srl a
 	ld hl, MonPartyData
 	ld e, a

maps/PewterCity.blk

@@ -10,7 +10,7 @@ ttn,)/7}:~B/B,)







 
 
 
-n,)
tttttt







>??,)








+n,)
tttt







>??,)








 
 
 
@@ -25,7 +25,9 @@ n,)
tttttt







>??,)








 



,)















,)ooooo
 
 
-
+
+
+
 
>??,)



 !

1wVww1
(,,,)

 
 

maps/Route12.blk

@@ -1,7 +1,7 @@
 ,,,)1(,,,,,+W%1$WWWW,)CCTCCCC,)CCTCCkk,)CCTCCCC,)TTzTCCC,)TxxTyTT,)TCCTxxx,)TC 
!CC,)xChiCC,)kk7:~kk,)CCCTCCC,)CCCTCCC,)TTTzTTC,)xxxxxTC,)TCCTTTC,)TCCTxxC,)zTTTCTCW%TxxxCTCTCCCCxCzTzTTTCTxTxxxCxCTTTCCCCxxzTCTTTCTxCTxTCTTCTCTTzTCTCxxxxCTTTzTTCxxxTxxC66kkkTCCCLLaaayCCCxxxTCCCCCCTCCCCCCTCCCCCCTCCC
 nCCCTTTC
 nCCCxxTC
-nzTTTTTC
+nTTTTTTC
 nTxxxxxC
 nTCCCCCC
 nTTTzTCC

maps/Route6.blk

@@ -11,7 +11,7 @@ hittt/7:~/
 
 
 
-//1111111111111111111111eCCCCCd1Qc
+/ !11111111|~11111111111111eCCCCCd1Qc
 
 11111
 MRR1

maps/Route7.blk

@@ -1 +1 @@
-111G_{11G_{\Kt111_{1111_ 
!
 !\7}~w|~11_{11111_{
+111G_{11Gt_{\Kt111_{1111_ 
!
 !\7}~w|~1111_{1111111_{

maps/Route8.blk

@@ -1,4 +1,4 @@
-(,,+WWWWWWWWWWWWWWWWWWWWW%(+$WW%tt1N
+(,,+WWWWWWWWWWWWWWWWWWWWW%(+$WW%N
 
 
 

maps/UndergroundPathNorthSouth.blk

@@ -1 +1 @@
-




	

























+




	





















maps/VermilionCity.blk

@@ -1 +1 @@
-CCC ! ! !1 !11111111Ckk|~|r7~17~wVwww111Cd1111111111111111C-111111111IH111CCC-111111DE111CCC !C !11 !111111Cd|~1|~11|swwwwVwCd1111111111111111Cd1
1111 !TCdV51|~edTeCCCCd11111ed111e-T.CCCCd11111e-.CTCdC-.CCCCCCTCdCCCCTTTTTTTTTTTC-gCCCCTxxxTxxxxxxCCCkkkTkTkkkkkkkCCCCCCCCCCCCCCCCCCCCCCCCTCCCTCCCCCCCCCC
+CCC ! ! !1 !11111111Ckk7~|r7~17~wVwww111Cd1111111111111111C-111111111IH111CCC-111111DE111CCC !C !11 !111111Cd|~1|~11|swwwwVwCd1111111111111111Cd1
1111 !TCdV21|~edTeCCCCd11111ed111e-T.CCCCd11111e-.CTCdC-.CCCCCCTCdCCCCTTTTTTTTTTTC-gCCCCTxxxTxxxxxxCCCkkkTkTkkkkkkkCCCCCCCCCCCCCCCCCCCCCCCCTCCCTCCCCCCCCCC

scripts/VermilionDock.asm

@@ -1,9 +1,7 @@
 VermilionDock_Script:
 	call EnableAutoTextBoxDrawing
-	;ld hl, VermilionDockTrainerHeaders
 	ld de, VermilionDock_ScriptPointers
 	call ExecuteCurMapScriptInTable
-	;call TruckCheck
 	CheckEventHL EVENT_STARTED_WALKING_OUT_OF_DOCK
 	jr nz, .asm_1db8d
 	CheckEventReuseHL EVENT_GOT_HM01
@@ -228,168 +226,3 @@ VermilionDock_TextPointers:
 VermilionDockText1:
 	text_far _VermilionDockText1
 	text_end
-
-; this massive new set of scripts allows the truck to be pushed with Strength. Credit to Vortyne's pureRGB hack for figuring this out!
-
-;VermilionDockTrainerHeaders:
-;	def_trainers
-;MewTrainerHeader:
-;	trainer EVENT_ENCOUNTERED_MEW, 0, MewBattleText, MewBattleText, MewBattleText
-;	db -1 ; end
-
-;VermilionDockText2:
-;	text_asm
-;	ld hl, MewTrainerHeader
-;	call TalkToTrainer
-;	jp TextScriptEnd
-
-;MewBattleText:
-;	text_far _MewtwoBattleText ; Mew!
-;	text_asm
-;	ld a, MEW
-;	call PlayCry
-;	call WaitForSoundToFinish
-;	jp TextScriptEnd
-
-;TruckOAMTable:
-;	db $50, $28, $C0, $10
-;	db $50, $30, $C1, $10
-;	db $50, $38, $C2, $10
-;	db $50, $40, $C3, $10
-;	db $58, $28, $C4, $10
-;	db $58, $30, $C5, $10
-;	db $58, $38, $C6, $10
-;	db $58, $40, $C7, $10
-
-;RedLeftOAMTable:
-;	db $8,$0,$9,$0
-;	db $a,$2,$b,$3
-
-;TruckSpriteGFX: INCBIN  "gfx/sprites/truck_sprite.2bpp"
-
-;TruckCheck:
-;	CheckEventHL EVENT_FOUND_MEW
-;	jp nz, ChangeTruckTile
-;	ld c, HS_MEW
-;	ld b, $2
-;	ld hl, wMissableObjectFlags
-;	predef FlagActionPredef
-;	ld a, c
-;	and a
-;	jr nz, .skiphidingmew
-;	ld a, HS_MEW
-;	ld [wMissableObjectIndex], a
-;	predef HideObject
-;.skiphidingmew
-;	ld a, [wd728]
-;	bit 0, a ; using Strength?
-;	ret z
-;	; the position for moving truck is $00, $15
-;	ld hl, wYCoord
-;	ld a, [hli]
-;	and a
-;	ret nz
-;	ld a, [hl]
-;	cp $16
-;	ret nz
-;	; if the player is trying to walk left
-;	ld a, [wPlayerDirection]
-;	cp 2
-;	ret nz
-	
-;	xor a
-;	ld [$ff8c], a
-;	ld a, $8
-;	ld [$ff8d], a
-;	call SetSpriteFacingDirection
-;	ld a, $ff
-;	ld [wJoyIgnore], a
-;	ld [wUpdateSpritesEnabled], a
-;	xor a
-;	ld bc, $4c48
-;	ld de, RedLeftOAMTable
-;	call WriteOAMBlock
-;	ld bc, (Bank(TruckSpriteGFX) << 8) | 8
-;	ld hl, vChars1 + $400
-;	ld de, TruckSpriteGFX
-;	call CopyVideoData
-;	ld hl, TruckOAMTable
-;	ld bc, $20
-;	ld de, wShadowOAM + $20
-;	call CopyData
-;	ld a, $c
-;	ld [wNewTileBlockID], a ; used to be wd09f
-;	ld bc, $a
-;	predef ReplaceTileBlock
-;	; moving the truck
-;	ld a, SFX_PUSH_BOULDER
-;	call PlaySound
-;	ld b, 32
-;	ld de, 4
-;.movingtruck
-;	ld hl, wShadowOAM + $21
-;	ld a, 8
-;.movingtruck2
-;	dec [hl]
-;	add hl, de
-;	dec a
-;	jr nz, .movingtruck2
-;	ld c, 2
-;	call DelayFrames
-;	dec b
-;	jr nz, .movingtruck
-;	ld a, $3
-;	ld [wNewTileBlockID], a ; used to be wd09f
-;	ld bc, $9
-;	predef ReplaceTileBlock
-;	call ShowMew
-;	jp FinishShowMew
-;	; show mew and print its dialogue
-;ShowMew:	
-;	ld a, 1
-;	ld [wUpdateSpritesEnabled], a
-;	ld a, HS_MEW
-;	ld [wMissableObjectIndex], a
-;	predef ShowObject
-;	ret
-;FinishShowMew:
-;	ld c, 60
-;	call DelayFrames
-;	xor a
-;	ld [wJoyIgnore], a
-;	SetEvent EVENT_FOUND_MEW
-;	ret
-
-;ChangeTruckTile:
-;	ld bc, $9
-;	call GetOWCoord
-;	ld a, [hl]
-;	cp $3
-;	ret z
-;	ld a, $3
-;	ld [hli], a
-;	ld a, $c
-;	ld [hl], a
-;	CheckEvent EVENT_ENCOUNTERED_MEW
-;	call z, ShowMew
-;	jpfar RedrawMapView
-;
-;GetOWCoord:
-;	ld hl, wOverworldMap + 2
-;	ld a, [wCurMapWidth]
-;	add $6
-;	ld e, a
-;	ld d, $0
-;	add hl, de
-;	add hl, de
-;	inc b
-;	inc c
-;.bloop
-;	add hl, de
-;	dec b
-;	jr nz, .bloop
-;.cloop
-;	inc hl
-;	dec c
-;	jr nz, .cloop
-;	ret

text/CopycatsHouse2F.asm

@@ -63,12 +63,9 @@ _TM31NoRoomText::
 	text_end
 
 _CopycatsHouse2FText2::
-	text "DODUO: Giiih!"
+	text "It's a JAGG"
-
+	line "doll with cute,"
-	para "MIRROR MIRROR ON"
+	cont "round eyes!"
-	line "THE WALL, WHO IS"
-	cont "THE FAIREST ONE"
-	cont "OF ALL?"
 	done
 
 _CopycatsHouse2FText3::