Bug Fixes & Enhancements

- Most, if not all, Silph Co. warps have been fixed. Inappropriate ones have been removed.
- The Metal Coat can now be found where one corrupted Silph Co. warp was to fill dead space, and another is in the Power Plant, replacing Carbos.
- Bill now trades you Hisuian Arcanine after being saved.
- Bill's Grandfather now trades you Hisuian Electrode. Had to remove Crinkles, but Tangela is literally right next to Cinnabar, c'mon lol
- Toedscool can now be found behind Pallet Town, replacing Gloom and Weepinbell, making it more focused.
- Now you can't run from Omega! May expand this to more Pokemon depending on feedback and whether it's ok on processing. Main concern is making the run button too laggy - it raised some eyebrows.

scripts/BillsHouse.asm

@@ -206,8 +206,9 @@ BillsHouseText_1e8cb:
 
 BillsHouseText3:
 	text_asm
-	ld hl, BillsHouseText_1e8da
-	call PrintText
+	ld a, TRADE_FOR_ARCANINE_H
+	ld [wWhichTrade], a
+	predef DoInGameTradeDialogue
 	jp TextScriptEnd
 
 BillsHouseText_1e8da:

scripts/CinnabarLabTradeRoom.asm

@@ -4,7 +4,7 @@ CinnabarLabTradeRoom_Script:
 CinnabarLabTradeRoom_TextPointers:
 	dw Lab2Text1
 	dw Lab2Text2
-	dw Lab2Text3
+;	dw Lab2Text3
 	dw CinnabarLabTrader
 
 Lab2Text1:
@@ -17,10 +17,10 @@ Lab2Text2:
 	ld [wWhichTrade], a
 	jr Lab2DoTrade
 
-Lab2Text3:
-	text_asm
-	ld a, TRADE_FOR_CRINKLES
-	ld [wWhichTrade], a
+;Lab2Text3:
+;	text_asm
+;	ld a, TRADE_FOR_CRINKLES
+;	ld [wWhichTrade], a
 Lab2DoTrade:
 	predef DoInGameTradeDialogue
 	jp TextScriptEnd

scripts/FuchsiaBillsGrandpasHouse.asm

@@ -11,9 +11,12 @@ FuchsiaHouse1Text1:
 	text_far _FuchsiaHouse1Text1
 	text_end
 
-FuchsiaHouse1Text2:
-	text_far _FuchsiaHouse1Text2
-	text_end
+FuchsiaHouse1Text2: ; Bill's Grandfather
+	text_asm
+	ld a, TRADE_FOR_ELECTRODE_H
+	ld [wWhichTrade], a
+	predef DoInGameTradeDialogue
+	jp TextScriptEnd
 
 FuchsiaHouse1Text3:
 	text_far _FuchsiaHouse1Text3

scripts/SilphCo11F.asm

@@ -405,7 +405,6 @@ SilphCo11MovementData_62305:
 SilphCo11MovementData_6230b:
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
-	db NPC_MOVEMENT_LEFT
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
 	db -1
@@ -414,7 +413,6 @@ SilphCo11MovementData_62311:
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
-	db NPC_MOVEMENT_LEFT
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
 	db -1