would you believe me if i told you this still isnt done

in the middle of a breakdown here but i'm committing this because I don't wanna have an overwhelming number of changed files like the Big One

- Fixed a bug where an item couldn't be picked up in Mt. Moon Crater

- Gave new cries to Leafeon, Glaceon, Perrserker, Gentlarva, Carapthor, Gorotora, Magnezone, Tangrowth, Tricules, Magmortar and Meltan. Pupal and Lickilicky also got new cries but they'll probably be changed later

- Changed Citrine's map slightly for hopefully the final time, removing the tall grass to allow the Old Man Glitch to work there

- Brought Pokemon Tower 5F back for some reason

- Moved the Rocket Grunt on Silph 11F closer to the Omegadge door

- 'Fixed' a warp issue on Faraway Island, can definitely be improved though

- Gave Gapdos 10 more base special because i forgot the first time

- Fixed a typo in Hitmontop's dex entry

- Fixed some inconsistencies in Gao and Gorotora's movesets

- Added the unused ice tiles to Seafoam Islands and Garnet Cavern (credit to Vortiene)

- Added a stats page to the Pokedex that displays base stats and the type of caught Pokemon (again, credit to Vortiene)

- Made Sandshrew more common in Mt. Moon

- Improved the 'already caught' icon

- uncapitalised all new instances of "trainer" in the text to make it more consistent

- HOPEFULLY fixed the issue where the SS Anne still couldn't be reboarded

scripts/BattleTent.asm

@@ -718,11 +718,11 @@ BattleTentWelcome:
 	text "Welcome to the"
 	line "BATTLE TENT!"
 	
-	para "Here, TRAINERs"
+	para "Here, trainers"
 	line "from far and"
 	cont "wide come to"
 	;cont "face a gauntlet"
-	;cont "of 10 TRAINERs!"
+	;cont "of 10 trainers!"
 	cont "spar against"
 	cont "one another!"
 	

scripts/SaffronGym.asm

@@ -47,6 +47,7 @@ SaffronGymReceiveTM46:
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	SetEvent EVENT_BEAT_SABRINA
+	ResetEvent EVENT_SS_ANNE_LEFT
 	lb bc, TM_PSYWAVE, 1
 	call GiveItem
 	jr nc, .BagFull

scripts/SilphCo11F.asm

@@ -165,16 +165,10 @@ MissableObjectIDs_6219b:
 	db HS_SAFFRON_CITY_E
 	db HS_SILPH_CO_3F_1
 	db HS_SILPH_CO_3F_2
-	;db HS_SILPH_CO_4F_1
-	;db HS_SILPH_CO_4F_2
-	;db HS_SILPH_CO_4F_3
 	db HS_SILPH_CO_5F_1
 	db HS_SILPH_CO_5F_2
 	db HS_SILPH_CO_5F_3
 	db HS_SILPH_CO_5F_4
-	;db HS_SILPH_CO_6F_1
-	;db HS_SILPH_CO_6F_2
-	;db HS_SILPH_CO_6F_3
 	db HS_SILPH_CO_7F_1
 	db HS_SILPH_CO_7F_2
 	db HS_SILPH_CO_7F_3
@@ -630,23 +624,14 @@ SaffronCityRockets:
 	db HS_SAFFRON_CITY_E
 	db HS_SILPH_CO_3F_1
 	db HS_SILPH_CO_3F_2
-	;db HS_SILPH_CO_4F_1
-	;db HS_SILPH_CO_4F_2
-	;db HS_SILPH_CO_4F_3
 	db HS_SILPH_CO_5F_1
 	db HS_SILPH_CO_5F_2
 	db HS_SILPH_CO_5F_3
 	db HS_SILPH_CO_5F_4
-	;db HS_SILPH_CO_6F_1
-	;db HS_SILPH_CO_6F_2
-	;db HS_SILPH_CO_6F_3
 	db HS_SILPH_CO_7F_1
 	db HS_SILPH_CO_7F_2
 	db HS_SILPH_CO_7F_3
 	db HS_SILPH_CO_7F_4
-	;db HS_SILPH_CO_8F_1
-	;db HS_SILPH_CO_8F_2
-	;db HS_SILPH_CO_8F_3
 	db HS_SILPH_CO_10F_1
 	db HS_SILPH_CO_10F_2
 	db HS_SILPH_CO_11F_1
@@ -671,7 +656,7 @@ SilphCo11F_TextPointers:
 SilphCo11TrainerHeaders:
 	def_trainers 5
 SilphCo11TrainerHeader0:
-	trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_1, 3, SilphCo11Trainer1BattleText, SilphCo11Trainer1EndBattleText, SilphCo11Trainer1AfterBattleText
+	trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_1, 1, SilphCo11Trainer1BattleText, SilphCo11Trainer1EndBattleText, SilphCo11Trainer1AfterBattleText
 Omega2TrainerHeader:
 	trainer EVENT_BEAT_OMEGA, 0, Omega2BattleText, Omega2BattleText, Omega2BattleText	
 	db -1 ; end

scripts/VermilionCity.asm

@@ -50,11 +50,8 @@ VermilionCityScript0:
 	ld a, $3
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
-	CheckEvent EVENT_BEAT_SABRINA
-	jr nz, .default
 	CheckEvent EVENT_SS_ANNE_LEFT
 	jr nz, .shipHasDeparted
-.default
 	ld b, S_S_TICKET
 	predef GetQuantityOfItemInBag
 	ld a, b
@@ -167,7 +164,6 @@ VermilionCityTextSSAnneDeparted:
 
 VermilionCityText3:
 	text_asm	
-
 	CheckEvent EVENT_SS_ANNE_LEFT
 	jr nz, .shipHasDeparted
 	ld a, [wSpritePlayerStateData1FacingDirection]
@@ -247,23 +243,9 @@ VermilionCityText14:
 	text_end
 
 VermilionCityText6:
-	text_asm
-	CheckEvent EVENT_BEAT_SABRINA
-	jr z, .default
-	ld hl, VermilionCityText15
-	ret
-.default
-	ld hl, VermilionCityText6get
-	ret
-
-VermilionCityText6get:
 	text_far _VermilionCityText6
 	text_end
 
-VermilionCityText15:
-	text_far _VermilionCityText15
-	text_end
-
 VermilionCityText7:
 	text_far _VermilionCityText7
 	text_end