A few minor fixes

Alters a few bugged texts, still need to fix Faraway's entrance tile

data/maps/objects/FarawayIslandOutside.asm

@@ -1,14 +1,14 @@
 FarawayIslandOutside_Object:
-	db $02 ; border block
+	db $2d ; border block
 
 	def_warp_events
-	warp_event 2, 29, VERMILION_CITY, 11
+	warp_event  2, 35, VERMILION_CITY, 11
-	warp_event 3, 29, VERMILION_CITY, 10
+	warp_event  3, 35, VERMILION_CITY, 10
-	warp_event 14,  6, FARAWAY_ISLAND_INSIDE, 1
+	warp_event 14, 12, FARAWAY_ISLAND_INSIDE, 1
-	warp_event 15,  6, FARAWAY_ISLAND_INSIDE, 2
+	warp_event 15, 12, FARAWAY_ISLAND_INSIDE, 2
 
 	def_bg_events
-	bg_event  2, 22, 1 ; Sign
+	bg_event  2, 28, 1 ; Sign
 
 	def_object_events
 

data/maps/town_map_entries.asm

@@ -80,7 +80,7 @@ InternalMapEntries:
 	internal_map VICTORY_ROAD_1F,                0,  4, VictoryRoadName
 	internal_map SILPH_GAUNTLET_7F,             10,  5, SilphCoName
 	internal_map LANCES_ROOM,                   0,  2, PokemonLeagueName
-	internal_map FARAWAY_ISLAND_INSIDE,         17,  16, FarawayIslandName
+	internal_map FARAWAY_ISLAND_INSIDE,         15,  15, FarawayIslandName
 	internal_map POKEMON_MANSION_B2F,             2, 15, PokemonMansionName
 	internal_map HALL_OF_FAME,                   0,  2, PokemonLeagueName
 	internal_map UNDERGROUND_PATH_NORTH_SOUTH,  10,  5, UndergroundPathName

data/pokemon/base_stats/betobebii.asm

@@ -1,6 +1,6 @@
 	db DEX_BETOBEBII ; pokedex id
 
-	db  65,  65,  35,  10,  25
+	db  65,  65,  35,  10,  25	; +5 to all stats
 	;   hp  atk  def  spd  spc
 
 	db POISON, POISON ; type

data/pokemon/base_stats/hinaazu.asm

@@ -1,6 +1,6 @@
 	db DEX_HINAAZU ; pokedex id
 
-	db  20,  70,  30,  20,  60
+	db  20,  70,  30,  60,  20	; +5 to all stats
 	;   hp  atk  def  spd  spc
 
 	db NORMAL, FLYING ; type

data/pokemon/base_stats/missingno.asm

@@ -0,0 +1,31 @@
+	db DEX_MISSINGNO ; pokedex id
+
+	db 211, 157,  53,  31,  47
+	;   hp  atk  def  spd  spc
+
+	db BIRD, NORMAL ; type
+	db 29 ; catch rate
+	db 255 ; base exp
+
+	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 GROWTH_SLOW ; growth rate
+
+	; tm/hm learnset
+	tmhm MEGA_PUNCH,   RAZOR_WIND,   SWORDS_DANCE, WHIRLWIND,    MEGA_KICK,    \
+	     TOXIC,        HORN_DRILL,   BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  \
+	     BUBBLEBEAM,   WATER_GUN,    ICE_BEAM,     BLIZZARD,     HYPER_BEAM,   \
+	     PAY_DAY,      SUBMISSION,   COUNTER,      SEISMIC_TOSS, RAGE,         \
+	     MEGA_DRAIN,   SOLARBEAM,    DRAGON_RAGE,  THUNDERBOLT,  THUNDER,      \
+	     EARTHQUAKE,   FISSURE,      DIG,          PSYCHIC_M,    TELEPORT,     \
+	     MIMIC,        DOUBLE_TEAM,  REFLECT,      BIDE,         METRONOME,    \
+	     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)
+	assert BANK(MissingNoPicFront) == BANK(MissingNoPicBack)

data/pokemon/base_stats/pudi.asm

@@ -1,6 +1,6 @@
 	db DEX_PUDI ; pokedex id
 
-	db  40,  55,  30,  45,  35
+	db  40,  55,  30,  45,  35	; added 5 to all stats to make BST closer to Mikon's
 	;   hp  atk  def  spd  spc
 
 	db FIRE, FIRE ; type

data/pokemon/base_stats/rhyperior.asm

@@ -1,6 +1,6 @@
 	db DEX_RHYPERIOR ; pokedex id
 
-	db 115, 140, 130,  50,  55
+	db 115, 140, 130,  40,  55
 	;   hp  atk  def  spd  spc
 
 	db GROUND, ROCK ; type

data/pokemon/base_stats/scizor.asm

@@ -1,6 +1,6 @@
 	db DEX_SCIZOR ; pokedex id
 
-	db  70, 130, 100,  60,  55
+	db  70, 130, 100,  65,  55
 	;   hp  atk  def  spd  spc
 
 	db BUG, STEEL ; type

data/pokemon/base_stats/totartle.asm

@@ -1,6 +1,6 @@
 	db DEX_TOTARTLE ; pokedex id
 
-	db  70, 100,  65,  78, 100
+	db  79,  83,  85,  78, 100
 	;   hp  atk  def  spd  spc
 
 	db WATER, GRASS ; type

data/pokemon/new_dex_text.asm

@@ -239,13 +239,13 @@ _CheepDexEntry::
 	dex
 
 _TotartleDexEntry::
-	text "Known for its"
+	text "A #MON capable"
-	next "longevity, the"
+	next "of living for"
-	next "oldest known"
+	next "10,000 years."
 
-	page "TOTARTLE lived"
+	page "Its algae-covered"
-	next "to be almost"
+	next "tail is a symbol"
-	next "1,000 years old"
+	next "of its longevity"
 	dex
 
 _WeirduckDexEntry::
@@ -349,13 +349,13 @@ _NidoreignDexEntry::
 	dex
 
 _BarundaDexEntry::
-	text "If it ever feels"
+	text "Often mistaken"
-	next "threatened, it"
+	next "for an ordinary"
-	next "will inflate its"
+	next "balloon. If its"
 
-	page "body to a gigantic"
+	page "tail is grabbed,"
-	next "size to intimidate"
+	next "it will let out a"
-	next "attackers"
+	next "shrill screech"
 	dex
 
 _TsubomittoDexEntry::

data/trainers/parties.asm

@@ -149,7 +149,7 @@ SailorData:
 
 JrTrainerMData:
 ; Pewter Gym
-	db 11, DIGLETT, SANDSHREW, 0
+	db 11, GEODUDE, SANDSHREW, 0
 ; Route 24/Route 25
 	db 14, RATTATA, EKANS, 0
 ; Route 24
@@ -433,7 +433,7 @@ JugglerData:
 	db 29, KADABRA, MR_MIME, 0
 ; Victory Road 2F
 	db 41, DROWZEE, HYPNO, KADABRA, KADABRA, 0
-; Fuchsia Gym
+; Fuchsia Gym (will be moved to Saffron Gym instead)
 	db 31, DROWZEE, DROWZEE, KADABRA, DROWZEE, 0
 	db 34, DROWZEE, HYPNO, 0
 ; Victory Road 2F
@@ -441,20 +441,21 @@ JugglerData:
 ; Unused - this will be used in the Silph Gauntlet
 	db 65, HYPNO, MR_MIME, ALAKAZAM, ELECTRODE, GENGAR, SLOWKING, 0
 ; Fuchsia Gym
-	db 38, HYPNO, 0
+	db 38, UMBREON, 0
+; Fuchsia Gym  (will be moved to Saffron Gym instead)
 	db 34, DROWZEE, KADABRA, 0
 
 TamerData:
 ; Fuchsia Gym
-	db 34, SANDSLASH, ARBOK, 0
+	db 34, NIDOQUEEN, ARBOK, 0
-	db 33, ARBOK, SANDSLASH, ARBOK, 0
+	db 33, ARBOK, NIDOKING, ARBOK, 0
 ; Viridian Gym
-	db 43, RHYHORN, 0
+	db 43, RHYDON, 0
-	db 39, ARBOK, TAUROS, 0
+	db 39, SANDSLASH, TRAMPEL, 0
 ; Victory Road 2F
-	db 44, PERSIAN, GOLDUCK, 0
+	db 44, TAUROS, GOLDUCK, 0
 ; Unused - this will be used in the Silph Gauntlet
-	db 66, RHYPERIOR, ARBOK, SANDSLASH, PRIMEAPE, GOLDUCK, TAUROS, 0
+	db 66, RHYPERIOR, ARBOK, SANDSLASH, PRIMEAPE, TRAMPEL, TAUROS, 0
 
 BirdKeeperData:
 ; Route 13
@@ -489,10 +490,10 @@ BlackbeltData:
 	db 32, MACHOP, MACHOKE, 0
 	db 36, PRIMEAPE, 0
 	db 31, MACHOP, MANKEY, PRIMEAPE, 0
-; Viridian Gym
+; Viridian Gym	- changed to fit the Ground-type gym theme
-	db 40, MACHOP, MACHOKE, 0
+	db 40, GRAVELER, GOLEM, 0
-	db 43, MACHOKE, 0
+	db 43, RHYDON, 0
-	db 38, MACHOKE, MACHOP, MACHOKE, 0
+	db 38, RHYHORN, ONIX, STEELIX, 0
 ; Victory Road 2F
 	db 43, MACHOKE, MACHOP, MACHOKE, 0
 
@@ -520,8 +521,8 @@ ChiefData:
 	db $FF, 73, MAGNEZONE, 72, LAPRAS, 73, SCIZOR, 73, EXEGGUTOR, 75, PORYGON2, 77, OMEGA, 0
 
 ScientistData:
-; Unused
+; Unused - this will be used in the Silph Gauntlet
-	db 34, KOFFING, VOLTORB, 0
+	db 64, MAGNEZONE, ELECTRODE, PORYGONZ, MUK, WEEZING, ALAKAZAM, 0
 ; Silph Co. 2F
 	db 26, GRIMER, WEEZING, KOFFING, WEEZING, 0
 	db 28, MAGNEMITE, VOLTORB, MAGNETON, 0
@@ -586,8 +587,8 @@ RocketData:
 	db 25, ZUBAT, ZUBAT, GOLBAT, 0
 	db 26, KOFFING, DROWZEE, 0
 	db 23, ZUBAT, RATTATA, RATICATE, ZUBAT, 0
-; Unused
+; Unused - this will be used in the Silph Gauntlet
-	db 26, DROWZEE, KOFFING, 0
+	db 65, PERSIAN, ARBOK, WEEZING, CROBAT, HYPNO, GUARDIA, 0
 ; Silph Co. 2F
 	db 29, CUBONE, ZUBAT, 0
 	db 25, GOLBAT, ZUBAT, ZUBAT, RATICATE, ZUBAT, 0
@@ -620,12 +621,12 @@ RocketData:
 
 CooltrainerMData:
 ; Viridian Gym
-	db 39, NIDORINO, NIDOKING, 0
+	db 39, MAROWAK, NIDOKING, 0
 ; Victory Road 3F
 	db 43, EXEGGUTOR, CLOYSTER, ARCANINE, 0
 	db 43, KINGLER, TENTACRUEL, BLASTOISE, 0
-; Unused
+; Unused - this will be used in the Silph Gauntlet
-	db 45, KINGLER, STARMIE, 0
+	db 66, TAUROS, VENUSAUR, NIDOKING, CHARIZARD, SNORLAX, TOTARTLE, 0
 ; Victory Road 1F
 	db 42, IVYSAUR, WARTORTLE, CHARMELEON, CHARIZARD, 0
 ; Unused
@@ -642,8 +643,8 @@ CooltrainerFData:
 ; Victory Road 3F
 	db 43, BELLSPROUT, WEEPINBELL, VICTREEBEL, 0
 	db 43, PARASECT, DEWGONG, CHANSEY, 0
-; Unused
+; Unused - this will be used in the Silph Gauntlet
-	db 46, VILEPLUME, BUTTERFREE, 0
+	db 66, PERSIAN, BLISSEY, GOROCHU, NINETALES, VAPOREON, VICTREEBEL, 0
 ; Victory Road 1F
 	db 44, PERSIAN, NINETALES, 0
 ; Unused
@@ -667,7 +668,7 @@ MistyData:
 	; db $FF, 66, STARMIE, 67, PENDRAKEN, 67, JABETTA, 66, TOTARTLE, 67, JAGG, 70, GYARADOS, 0
 
 LtSurgeData:
-	db $FF, 22, VOLTORB, 21, GAOTORA, 22, MAGNEMITE, 23, ELECTABUZZ, 24, GOROCHU, 0
+	db $FF, 22, VOLTORB, 21, GAOTORA, 22, MAGNETITE, 23, ELECTABUZZ, 25, GOROCHU, 0
 ; post-game rematch team (currently unused)
 	; db $FF, 66, ELECTRODE, 67, GOROTORA, 67, ELECTIVIRE, 66, JOLTEON, 67, GOROCHU, 70, ZAPDOS, 0
 
@@ -697,8 +698,8 @@ GentlemanData:
 	db 19, NIDORAN_M, NIDORAN_F, 0
 ; SS Anne 2F Rooms/Vermilion Gym
 	db 23, PIKACHU, 0
-; Unused
+; Unused - this will be used in the Silph Gauntlet
-	db 48, PRIMEAPE, 0
+	db 64, ARCANINE, NIDOQUEEN, PRIMEAPE, FEAROW, JAGG, RAPIDASH, 0
 ; SS Anne 2F Rooms
 	db 17, GROWLITHE, PONYTA, 0
 
@@ -732,7 +733,7 @@ Green3Data:
 LoreleiData:
 	db $FF, 54, DEWGONG, 53, CLOYSTER, 54, GLACEON, 55, JYNX, 55, BUU, 56, LAPRAS, 0
 ; post-game rematch team (currently unused)
-	; db $FF, 74, BUU, 73, DEWGONG, 74, GLACEON, 75, CLOYSTER, 75, LAPRAS, 76, ARTICUNO, 0
+	; db $FF, 74, DEWGONG, 73, NINETALES_A, 74, GLACEON, 75, CLOYSTER, 75, LAPRAS, 76, ARTICUNO, 0
 
 ChannelerData:
 ; Unused
@@ -768,7 +769,7 @@ ChannelerData:
 	db 22, GASTLY, CUBONE, HAUNTER, 0
 	db 24, GASTLY, VULPIX, 0
 	db 30, HAUNTER, 0
-; Saffron Gym
+; Saffron Gym (will be moved to Fuchsia Gym instead)
 	db 34, GASTLY, HAUNTER, 0
 	db 38, HAUNTER, 0
 	db 33, GASTLY, GASTLY, HAUNTER, 0
@@ -776,10 +777,10 @@ ChannelerData:
 AgathaData:
 	db $FF, 57, CROAKOZUNA, 56, CROBAT, 56, TSUBOMITTO, 58, UMBREON, 58, ARBOK, 60, GENGAR, 0
 ; post-game rematch team (currently unused)
-	; db $FF, 77, CROAKOZUNA, 76, TSUBOMITTO, 76, UMBREON, 78, CROBAT, 78, GENGAR, 80, MOLTRES_G, 0
+	; db $FF, 77, CROAKOZUNA, 76, MAROWAK_A, 76, UMBREON, 78, CROBAT, 78, GENGAR, 80, MOLTRES_G, 0
 
 LanceData:
 	db $FF, 58, CROCKY, 57, KINGDRA, 57, AERODACTYL, 59, CRYITHAN, 59, CHARIZARD, 62, DRAGONITE, 0
 ; post-game rematch team (currently unused)
-	; db $FF, 78, CROCKY, 77, KINGDRA, 77, AERODACTYL, 79, CHARIZARD, 79, CRYITHAN, 82, DRAGONITE, 0
+	; db $FF, 78, CROCKY, 77, KINGDRA, 77, AERODACTYL, 79, EXEGGUTOR_A, 79, CRYITHAN, 82, DRAGONITE, 0
 

engine/items/town_map.asm

@@ -384,6 +384,8 @@ DisplayWildLocations:
 	ld a, [de]
 	cp $19 ; Cerulean Cave's coordinates
 	jr z, .nextEntry ; skip Cerulean Cave
+	cp $5A ; Silph Gauntlet's coordinates
+	jr z, .nextEntry ; skip
 	call TownMapCoordsToOAMCoords
 	ld a, $4 ; nest icon tile no.
 	ld [hli], a

maps/FarawayIslandOutside.blk

@@ -1 +1,3 @@
-@BB-@BB-@

BB-@


XBB-@


CEFB-@




CEFcCF-@





BbAAB--@AC?
BACEF--DGF@CG?BAB----@AB@BA@CFCF-c--@AB@BA@BCF---<=@aF@BA@BB----@@BADFADFB-c--@DFEEEEGEF----@Y&----c-DEc----c-------c-----c------------c------------
+@B-@B-@B-@B-@B-@B-<===>XB-@ACGF

CEFB-DGF



CEFcCF-@AA
+


BbAAB--@AC?
+BACEF--DGF@AAABAB----@AB@CG?CFCF-c--@AB@BA@BEF---<=@aF@BA@B-----@@BADFADF--c--@DFEEEEGF-----@'Y&----c-DE

maps/ViridianCity.blk

@@ -1,9 +1,14 @@
 ,,),,)
111111,,)
-RRR4


111
1,,)M
111,,)M
,,)M







1WW%M
wwwwwwww
+RRR4


111
1,,)M
111,,)M
,,)M







1WW%M

+
wwwwwwww
 
 
-M






1


+MV






1


-llll
ww

+
+
+
+
+
ww

  !
 
?;







tt

 |s

text/FarawayIslandOutside.asm

@@ -4,15 +4,15 @@ _FarawayIslandSign::
 	cont "was written a"
 	cont "long time ago..."
 	
-	text "...ber, 6th day"
+	para "...ber, 6th day"
 	
-	text "If any human..."
+	para "If any human..."
 	line "sets foot here..."
 	cont "again...et it be"
 	cont "a kindhearted"
 	cont "pers..."
 	
-	text "...ith that hope,"
+	para "...ith that hope,"
 	line "I depar..."
 	cont "...JI"