minor post-playtest fixes

- Moved one of the trainers in the Celadon Uni PokeCenter to stop him from being in the way of the nurse

- Buffed one of the Scientists in the Mansion

- Moved the nurse and Weezing trader on the SS Anne slightly

- Boosted Meltan's catch rate because having it be that low is ridiculous

- Increased Luxwan's height because real swans are not that small

- Changed a Cue Ball's party to allow his dialogue to make sense

- Wild level balancing around Vermilion City

- Fixed a small Pokedex display bug

- Text fixes

data/maps/objects/CeladonUniversityPokecenter.asm

@@ -11,7 +11,7 @@ CeladonUniversityPokecenter_Object:
 	object_event  3,  1, SPRITE_NURSE, STAY, DOWN, 1 ; person
 	object_event  8,  3, SPRITE_SCIENTIST, STAY, LEFT_RIGHT, 2 ; person
 	object_event 10,  5, SPRITE_MIDDLE_AGED_MAN, WALK, LEFT_RIGHT, 3 ; spamton
-	object_event  3,  5, SPRITE_SUPER_NERD, STAY, DOWN, 4 ; person
+	object_event  6,  5, SPRITE_SUPER_NERD, STAY, LEFT_RIGHT, 4 ; person
 	object_event 11,  2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 5 ; person
 	object_event  4,  1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
 

data/maps/objects/PokemonMansion1F.asm

@@ -14,7 +14,7 @@ PokemonMansion1F_Object:
 	def_bg_events
 
 	def_object_events
-	object_event 17, 17, SPRITE_SCIENTIST, STAY, LEFT, 1, OPP_SCIENTIST, 4
+	object_event 17, 17, SPRITE_SCIENTIST, STAY, LEFT, 1, OPP_SCIENTIST, 5
 	object_event 14,  3, SPRITE_POKE_BALL, STAY, NONE, 2, ESCAPE_ROPE
 	object_event 18, 21, SPRITE_POKE_BALL, STAY, NONE, 3, CARBOS
 

data/maps/objects/SSAnne1FRooms.asm

@@ -24,7 +24,7 @@ SSAnne1FRooms_Object:
 	object_event 12, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_BODY_SLAM
 	object_event 21, 13, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 11 ; person
 	object_event  0,  4, SPRITE_GAMEBOY_KID, STAY, DOWN, 12 ; Perrserker Trader
-	object_event 10,  4, SPRITE_GAMEBOY_KID, STAY, DOWN, 13 ; Weezing Trader
-	object_event 23,  3, SPRITE_NURSE, STAY, LEFT, 14 ; Healer
+	object_event 20,  4, SPRITE_GAMEBOY_KID, STAY, DOWN, 13 ; Weezing Trader
+	object_event 23,  1, SPRITE_NURSE, STAY, LEFT, 14 ; Healer
 
 	def_warps_to SS_ANNE_1F_ROOMS

data/pokemon/base_stats/meltan.asm

@@ -4,7 +4,7 @@
 	;   hp  atk  def  spd  spc
 
 	db STEEL, STEEL ; type
-	db 3 ; catch rate
+	db 45 ; catch rate
 	db 131 ; base exp
 
 	INCBIN "gfx/pokemon/front/meltan.pic", 0, 1 ; sprite dimensions

data/pokemon/dex_entries.asm

@@ -1346,8 +1346,8 @@ RamooseDexEntry:
 	text_end
 
 LuxwanDexEntry:
-	db "MASQUERADE@"	; changed from Wild Duck since it's more closely based on a mute swan
-	db 3,11
+	db "MASQUERADE@"	; changed from Wild Duck since it's more closely based on a swan
+	db 5,3
 	dw 590
 	text_far _LuxwanDexEntry
 	text_end

data/trainers/parties.asm

@@ -404,8 +404,8 @@ CueBallData:
 	db 33, CARAPTHOR, 0
 ; Route 17
 	db 29, MANKEY, PRIMEAPE, 0
-	db 29, MACHOP, MACHOKE, 0
-	db 33, JABETTA, 0
+	db 29, CHEEP, JABETTA, 0
+	db 33, MACHOKE, 0
 	db 26, MANKEY, MACHOKE, CROAKOZUNA, 0
 	db 29, PRIMEAPE, MACHOKE, 0
 ; Route 21
@@ -551,10 +551,10 @@ ScientistData:
 ; Silph Co. 2F (unused)
 	db 26, GRIMER, WEEZING, KOFFING, WEEZING, 0
 	db 28, MAGNETITE, VOLTORB, MAGNETON, 0
-; Silph Co. 3F/Mansion 1F
+; Silph Co. 3F
 	db 29, ELECTRODE, MUK, 0
-; Silph Co. 4F (unused)
-	db 33, VOLTORB, ELECTRODE, KOFFING, 0
+; Mansion 1F
+	db 36, VOLTORB, ELECTRODE, KOFFING, 0
 ; Silph Co. 5F
 	db 26, MAGNEMITE, KOFFING, WEEZING, MAGNETITE, 0
 ; Silph Co. 6F (unused)

data/wild/maps/Route11.asm

@@ -7,7 +7,7 @@ Route11WildMons:
 	db 13, MAGNEMITE
 	db 13, DROWZEE
 	db 15, SANDSHREW
-	db 17, SPEAROW
+	db 16, SPEAROW
 	db 11, DROWZEE
 	db 15, RATICATE
 	end_grass_wildmons

data/wild/maps/Route6.asm

@@ -7,8 +7,8 @@ Route6WildMons:
 	db 13, RATTATA
 	db 13, PIDGEY
 	db 15, PIDGEOTTO
-	db 10, MEOWTH
-	db 12, MEOWTH
+	db 15, MEOWTH
+	db 16, MEOWTH
 	db 15, GROWLITHE
 	db 16, GROWLITHE
 	db 16, JIGGLYPUFF

engine/menus/pokedex.asm

@@ -202,7 +202,6 @@ HandlePokedexListMenu:
 	ld de, PokedexMenuItemsText
 	call PlaceString
 ; find the highest pokedex number among the pokemon the player has seen
-	ld hl, wPokedexSeenEnd - 1
 	ld b, 251 ; This makes the last number in the dex match up with the last Pokemon in dex order. This makes it look a little odd when incomplete but also allows for Pokemon beyond 248 to display correctly.
 .maxSeenPokemonLoop
 	ld a, [hld]

text/CeladonUniversityPokecenter.asm

@@ -53,7 +53,7 @@ _CeladonUniversityPokecenterText8::
 	line "DRAGONAIR can fly"
 	cont "without wings..."
 	
-	para "#MON are strange"
+	para "#MON are odd"
 	line "creatures..."
 	
 	done

text/FuchsiaGym_2.asm

@@ -115,7 +115,7 @@ _FuchsiaGymBattleText4::
 
 _FuchsiaGymEndBattleText4::
 	text "Whoa!"
-	line "He's got it!"
+	line "You've got it!"
 	prompt
 
 _FuchsiaGymAfterBattleText4::

text/Route15Gate2F.asm

@@ -5,11 +5,6 @@ _Route15GateUpstairsText_4968c::
 	cont "you, even if they"
 	cont "don't fight."
 
-	para "It does, however,"
-	line "reduce the amount"
-	cont "of EXP for each"
-	cont "#MON."
-
 	para "If you don't need"
 	line "it, you should "
 	cont "store it via PC."

text/Route22.asm

@@ -2,8 +2,9 @@ _Route22RivalBeforeBattleText1::
 	text "<RIVAL>: Hey!"
 	line "<PLAYER>!"
 
-	para "You're going to"
-	line "#MON LEAGUE?"
+	para "Ha! You're going"
+	para "to the #MON"
+	line "LEAGUE?"
 
 	para "Forget it! You"
 	line "probably don't"
@@ -18,7 +19,7 @@ _Route22RivalBeforeBattleText1::
 	done
 
 _Route22RivalAfterBattleText1::
-	text "I heard #MON"
+	text "I heard that the"
 	line "LEAGUE has many"
 	cont "tough trainers!"
 
@@ -52,25 +53,23 @@ _Route22RivalBeforeBattleText2::
 	cont "surprise to see"
 	cont "you here!"
 
-	para "So you're going to"
-	line "#MON LEAGUE?"
-
 	para "You collected all"
 	line "the BADGEs too?"
 	cont "That's cool!"
 
-	para "Then I'll whip you"
-	line "<PLAYER> as a"
-	cont "warm up for"
-	cont "#MON LEAGUE!"
+	para "Then, I'll whip"
+	line "you as a warm up"
+	cont "for the #MON"
+	cont "LEAGUE!"
 
 	para "Come on!"
 	done
 
 _Route22RivalAfterBattleText2::
 	text "That loosened me"
-	line "up! I'm ready for"
-	cont "#MON LEAGUE!"
+	line "up! Now I'm ready"
+	cont "for the #MON"
+	cont "LEAGUE!"
 
 	para "<PLAYER>, you need"
 	line "more practice!"

text/SaffronCity.asm

@@ -153,7 +153,7 @@ _UpGradePreReceiveText::
 	cont "those TEAM"
 	cont "ROCKET thugs?"
 	
-	text "Thank you so"
+	para "Thank you so"
 	line "much! Here,"
 	cont "take this!"
 	prompt

text/SilphCo7F.asm

@@ -169,7 +169,8 @@ _SilphCo7Text_51ec3::
 _SilphCo7Text_51ec8::
 	text "Oh ho!"
 	line "So, you are ready"
-	cont "for BOSS ROCKET!"
+	cont "for the TEAM"
+	cont "ROCKET BOSS!"
 	prompt
 
 _SilphCo7Text_51ecd::