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.

constants/script_constants.asm

@@ -28,7 +28,7 @@ DEF SLOTS_SOMEONESKEYS EQU $ff
 	const TRADE_FOR_JIMBO
 	const TRADE_FOR_MICHELLE
 	const TRADE_FOR_JENNY
-	const TRADE_FOR_CRINKLES
+;	const TRADE_FOR_CRINKLES - removed due to a new limit being found w/ electrode-h
 	const TRADE_FOR_RICKY 
 	const TRADE_WITH_SELF ; Celadon University
 	const TRADE_FOR_RATICATE_A ; LGPE Trade references - Viridian
@@ -51,6 +51,8 @@ DEF SLOTS_SOMEONESKEYS EQU $ff
 	const TRADE_FOR_MR_RIME
 	const TRADE_FOR_PERRSERKER
 	const TRADE_FOR_SIRFETCHD
+	const TRADE_FOR_ARCANINE_H
+	const TRADE_FOR_ELECTRODE_H
 DEF NUM_NPC_TRADES EQU const_value
 
 ; in game trade dialog sets
@@ -61,9 +63,11 @@ DEF NUM_NPC_TRADES EQU const_value
 	const TRADE_DIALOGSET_HAPPY
 	const TRADE_DIALOGSET_SELF
 	const TRADE_DIALOGSET_REGION ; consistency with LGPE
-	const TRADE_DIALOGSET_TAUROSC ; Fighting Tauros lovers
+	const TRADE_DIALOGSET_TAUROSC ; Fighting Tauros Brothers!
 	const TRADE_DIALOGSET_TAUROSA
 	const TRADE_DIALOGSET_TAUROSB
+	const TRADE_DIALOGSET_BILL
+	const TRADE_DIALOGSET_GRAMPS
 
 ; badges
 ; wObtainedBadges and wBeatGymFlags bits

data/events/trades.asm

@@ -10,7 +10,6 @@ TradeMons:
 	db PERSIAN,    TAUROS,      TRADE_DIALOGSET_CASUAL,    "JIMBO@@@@@@" ; From JP Blue
 	db MACHOKE,    HAUNTER,     TRADE_DIALOGSET_EVOLUTION, "MICHELLE@@@" ; From JP Blue
 	db KADABRA,    GRAVELER,    TRADE_DIALOGSET_EVOLUTION, "JENNY@@@@@@" ; From JP Blue
-	db VENONAT,    TANGELA,     TRADE_DIALOGSET_HAPPY,     "CRINKLES@@@"
 	db CUBONE,     MACHOKE,     TRADE_DIALOGSET_HAPPY,     "RICKY@@@@@@" ; From Yellow
 	db NO_MON,     NO_MON,      TRADE_DIALOGSET_SELF,      "Unseen@@@@@" ; Celadon Uni Trader
 	db RATICATE,   RATICATE_A,  TRADE_DIALOGSET_REGION,    "RATICATE@@@" ; Viridian - LGPE trades begin here
@@ -33,4 +32,6 @@ TradeMons:
 	db MR_MIME,    MR_RIME,     TRADE_DIALOGSET_CASUAL,    "CHURCHILL@@" ; Winston Churchill, notable "city gent" 
 	db PERSIAN,    PERRSERKER,  TRADE_DIALOGSET_HAPPY,     "ERIK@@@@@@@" ; One of the most famous vikings
 	db MADAAMU,    SIRFETCHD,   TRADE_DIALOGSET_HAPPY,     "LANCELOT@@@" ; Influential knight of the round table
+	db ARCANINE,   ARCANINE_H,  TRADE_DIALOGSET_BILL,	   "ARCANINE@@@"
+	db ELECTRODE,  ELECTRODE_H, TRADE_DIALOGSET_GRAMPS,    "ELECTRODE@@"
 	assert_table_length NUM_NPC_TRADES

data/maps/objects/CinnabarLabTradeRoom.asm

@@ -10,7 +10,7 @@ CinnabarLabTradeRoom_Object:
 	def_object_events
 	object_event  3,  2, SPRITE_SUPER_NERD, STAY, DOWN, 1 ; person
 	object_event  1,  4, SPRITE_GRAMPS, STAY, NONE, 2 ; person
-	object_event  5,  5, SPRITE_BEAUTY, STAY, UP, 3 ; person
-	object_event  3,  5, SPRITE_GAMEBOY_KID, STAY, DOWN, 4 ; Trader
+;	object_event  5,  5, SPRITE_BEAUTY, STAY, UP, 3 ; person
+	object_event  3,  5, SPRITE_GAMEBOY_KID, STAY, DOWN, 3 ; Trader
 
 	def_warps_to CINNABAR_LAB_TRADE_ROOM

data/maps/objects/PowerPlant.asm

@@ -18,7 +18,7 @@ PowerPlant_Object:
 	object_event 21, 14, SPRITE_VOLTORB, STAY, UP, 7, ELECTRODE, 43 | OW_POKEMON
 	object_event 37, 32, SPRITE_VOLTORB, STAY, UP, 8, VOLTORB, 40 | OW_POKEMON
 	object_event  4,  9, SPRITE_BIRD, STAY, UP, 9, ZAPDOS, 50 | OW_POKEMON
-	object_event  7, 25, SPRITE_POKE_BALL, STAY, NONE, 10, CARBOS
+	object_event  7, 25, SPRITE_POKE_BALL, STAY, NONE, 10, METAL_COAT
 	object_event 28,  3, SPRITE_POKE_BALL, STAY, NONE, 11, HP_UP
 	object_event 34,  3, SPRITE_POKE_BALL, STAY, NONE, 12, RARE_CANDY
 	object_event 26, 32, SPRITE_POKE_BALL, STAY, NONE, 13, TM_THUNDER

data/maps/objects/RedsHouse2F.asm

@@ -3,8 +3,8 @@ RedsHouse2F_Object:
 
 	def_warp_events
 	warp_event  7,  1, REDS_HOUSE_1F, 3
-	warp_event  5,  1, SILPH_GAUNTLET_7F, 1 ; - Test Chief 
-	;warp_event  5,  1, SILPH_CO_11F, 2 ; - Test J&J, Omega, & Giovanni. To test the Omega refight, change to SHOW in hide/show data, and set warp ID to 1.
+	;warp_event  5,  1, SILPH_GAUNTLET_7F, 1 ; - Test Chief 
+	warp_event  5,  1, SILPH_CO_11F, 2 ; - Test J&J, Omega, & Giovanni. To test the Omega refight, change to SHOW in hide/show data, and set warp ID to 1.
 	;warp_event  5,  1, ROCKET_HIDEOUT_B4F, 2 ; - Test Giovanni 1
 	;warp_event  5,  1, MT_MOON_SQUARE, 1 ; - Test Shop, NPCs, and Crater
 	;warp_event  5,  1, CELESTE_HILL, 1 ; - Test GMolt

data/maps/objects/SilphCo11F.asm

@@ -5,7 +5,7 @@ SilphCo11F_Object:
 	warp_event  9,  0, SILPH_CO_7F, 1
 ;	warp_event 13,  0, SILPH_CO_ELEVATOR, 1
 ;	warp_event  2,  2, LAST_MAP, 10
-	warp_event  3,  2, SILPH_CO_7F, 2
+	warp_event  3,  2, SILPH_CO_7F, 3
 
 	def_bg_events
 

data/maps/objects/SilphCo3F.asm

@@ -7,7 +7,7 @@ SilphCo3F_Object:
 ;	warp_event 20,  0, SILPH_CO_ELEVATOR, 1
 ;	warp_event 23, 11, SILPH_CO_3F, 10
 	warp_event  3,  3, SILPH_CO_5F, 6
-	warp_event  3, 15, SILPH_CO_5F, 7
+;	warp_event  3, 15, SILPH_CO_5F, 7
 ;	warp_event 27,  3, SILPH_CO_2F, 4
 ;	warp_event  3, 11, SILPH_CO_9F, 4
 	warp_event 11, 11, SILPH_CO_7F, 4
@@ -19,6 +19,6 @@ SilphCo3F_Object:
 	object_event 24,  8, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
 	object_event 20,  7, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 25
 	object_event  7,  9, SPRITE_SCIENTIST, STAY, DOWN, 3, OPP_SCIENTIST, 4
-	object_event  8,  5, SPRITE_POKE_BALL, STAY, NONE, 4, HYPER_POTION
+	object_event  3, 15, SPRITE_POKE_BALL, STAY, NONE, 4, METAL_COAT ; !!!
 
 	def_warps_to SILPH_CO_3F

data/maps/objects/SilphCo5F.asm

@@ -2,8 +2,8 @@ SilphCo5F_Object:
 	db $2e ; border block
 
 	def_warp_events
-	warp_event 24,  0, SILPH_CO_7F, 2
 	warp_event 26,  0, SILPH_CO_3F, 2
+	warp_event 24,  0, SILPH_CO_7F, 2
 ;	warp_event 20,  0, SILPH_CO_ELEVATOR, 1
 ;	warp_event 27,  3, SILPH_CO_7F, 6
 ;	warp_event  9, 15, SILPH_CO_9F, 5

data/maps/objects/SilphCo7F.asm

@@ -3,10 +3,10 @@ SilphCo7F_Object:
 
 	def_warp_events
 	warp_event 16,  0, SILPH_CO_11F, 1
-	warp_event 22,  0, SILPH_CO_5F, 2
+	warp_event 22,  0, SILPH_CO_5F, 1
 ;	warp_event 18,  0, SILPH_CO_ELEVATOR, 1
 	warp_event  5,  7, SILPH_CO_11F, 2
-	warp_event  5,  3, SILPH_CO_3F, 5
+	warp_event  5,  3, SILPH_CO_3F, 4
 ;	warp_event 21, 15, SILPH_CO_5F, 4
 
 	def_bg_events

data/wild/maps/Route21.asm

@@ -5,8 +5,8 @@ Route21WildMons:
 	db 30, BARUNDA
 	db 30, MR_MIME
 	db 29, MR_MIME
-	db 29, GLOOM
-	db 29, WEEPINBELL
+	db 29, TOEDSCOOL
+	db 29, TOEDSCOOL
 	db 28, TANGELA
 	db 30, TANGELA
 	db 32, TANGELA

engine/battle/core.asm

@@ -1594,6 +1594,9 @@ TryRunningFromBattle:
 	cp BATTLE_TYPE_SAFARI
 	jp z, .canEscape ; jump if it's a safari battle
 	ld a, [wLinkState]
+	ld a, [wCurOpponent]
+	cp OMEGA
+	jp z, .omegaCantEscape
 	cp LINK_STATE_BATTLING
 	jp z, .canEscape
 	ld a, [wIsInBattle]
@@ -1666,6 +1669,9 @@ TryRunningFromBattle:
 	ld [wActionResultOrTookBattleTurn], a ; you lose your turn when you can't escape
 	ld hl, CantEscapeText
 	jr .printCantEscapeOrNoRunningText
+.omegaCantEscape
+	ld hl, NoRunningOmega
+	jr .printCantEscapeOrNoRunningText
 .trainerBattle
 	ld hl, NoRunningText
 .printCantEscapeOrNoRunningText
@@ -1712,6 +1718,13 @@ NoRunningText:
 	text_far _NoRunningText
 	text_end
 
+NoRunningOmega:
+	text "It's far too"
+	line "aggressive! You"
+	cont "can't run!"
+	prompt
+	text_end
+
 GotAwayText:
 	text_far _GotAwayText
 	text_end

engine/debug/debug_party.asm

@@ -25,8 +25,8 @@ IshiharaTeam:
 	db MELTAN, 90
 	db TRAMPEL, 90
 	db MEWTWO, 90
-	db RAICHU_A, 50
-	db CROCKY, 5
+	db ELECTRODE, 50
+	db ARCANINE, 50
 	db -1 ; end
 
 DebugStart:

engine/events/in_game_trades.asm

@@ -276,6 +276,8 @@ InGameTradeTextPointers:
 	dw TradeTextPointers6 ; Combat Tauros
 	dw TradeTextPointers7 ; Aqua Tauros
 	dw TradeTextPointers8 ; Blaze Tauros
+	dw TradeTextPointersBill
+	dw TradeTextPointersGramps
 
 TradeTextPointers1:
 	dw WannaTrade1Text
@@ -333,6 +335,20 @@ TradeTextPointers8: ; Aqua Tauros
 	dw Thanks6Text
 	dw AfterTrade8Text
 
+TradeTextPointersBill: ; Bill
+	dw BillWannaTradeText
+	dw BillNoTradeText
+	dw BillWrongMonText
+	dw BillThanksText
+	dw BillAfterTradeText
+
+TradeTextPointersGramps: ; Bill's grandfather
+	dw GrampsWannaTradeText
+	dw GrampsNoTradeText
+	dw GrampsWrongMonText
+	dw GrampsThanksText
+	dw GrampsAfterTradeText
+
 ConnectCableText:
 	text_far _ConnectCableText
 	text_end
@@ -462,3 +478,111 @@ WrongMon8Text:
 AfterTrade8Text:
 	text_far _AfterTrade8Text
 	text_end
+
+BillWannaTradeText:
+	text "BILL: Say, bud,"
+	line "do you happen"
+	cont "to have an"
+	cont "ARCANINE?"
+	
+	para "I caught this"
+	line "special one in"
+	cont "my experiments,"
+	cont "but it's not"
+	cont "tame at all."
+	
+	para "If you trade"
+	line "me yours, you"
+	cont "can have it!"
+	done
+	text_end
+
+BillNoTradeText:
+	text "No? Well, it"
+	line "isn't going"
+	cont "anywhere..."
+	done
+	text_end
+
+BillWrongMonText:
+	text "That's no"
+	line "ARCANINE, bud!"
+	cont "You trying to"
+	cont "con me?"
+	done
+	text_end
+
+BillThanksText:
+	text "Thanks a bunch!"
+	done
+	text_end
+
+BillAfterTradeText:
+	text "I've been working"
+	line "on a machine to"
+	cont "connect with the"
+	cont "past."
+	
+	para "That's how I got"
+	line "that ARCANINE!"
+	
+	para "Take care of it,"
+	line "would ya?"
+	done
+	text_end
+	
+GrampsWannaTradeText:
+	text "Hmm? You've met"
+	line "BILL?"
+
+	para "He's my grandson!"
+	
+	para "He gave me this"
+	line "ELECTRODE that"
+	cont "reminds me of my"
+	cont "younger years,"
+	cont "but..."
+	
+	para "It's just too"
+	line "aggressive! Do"
+	cont "you mind trading"
+	cont "me a more modern"
+	cont "one?"
+	done
+	text_end
+
+GrampsNoTradeText:
+	text "No? Oh..."
+	done
+	text_end
+
+GrampsWrongMonText:
+	text "My eyes aren't"
+	line "what they used"
+	cont "to be..."
+	
+	para "But that's no"
+	line "ELECTRODE!"
+	done
+	text_end
+
+GrampsThanksText:
+	text "Thank you so"
+	line "much!"
+	done
+	text_end
+
+GrampsAfterTradeText:
+	text "I don't know"
+	line "where BILL got"
+	cont "that ELECTRODE."
+	
+	para "He said something"
+	line "about a time"
+	cont "machine..."
+	
+	para "That has to be"
+	line "impossible..."
+	done
+	text_end
+

maps/SilphCo1F.blk

@@ -1 +1 @@
-<===<=}=>===}>~""#HXWJ	FDFD
[[	FD [[[[[[[9FD
[[	FDFDFHIIIX,WIIIIIIIJ
+<===<=$=>===}>~""#HXWJ	FDFD
[[	FD [[[[[[[9FD
[[	FDFDFHIIIX,WIIIIIIIJ

maps/SilphCo3F.blk

@@ -1 +1 @@
-<===========}$>DF`aaABaAaBZaaabd4VVVfD6GGFD7Z/ZZCCFPIIIJIIIJVIIIQD/FHIIIIIIIIIIIIIJ
+<===========}$>DF`aaABaAaBZaaabd4VVVfD6GGFD7Z/ZZCCFPIIIJIIIJVIIIQDFHIIIIIIIIIIIIIJ

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

text/BillsHouse.asm

@@ -83,10 +83,11 @@ _BillsHouseText_1e8cb::
 	done
 
 _BillsHouseText_1e8da::
-	text "BILL: Look, bud,"
-	line "just check out"
-	cont "some of my rare"
-	cont "#MON on my PC!"
+	text "BILL: Say, pal,"
+	line "you wouldn't"
+	cont "happen to have"
+	cont "one of these,"
+	cont "would you?"
 	done
 
 _BillsHouseNidorino::

text/FuchsiaBillsGrandpasHouse.asm

@@ -7,16 +7,17 @@ _FuchsiaHouse1Text1::
 	line "false, though."
 	done
 
-_FuchsiaHouse1Text2::
-	text "Hmm? You've met"
-	line "BILL?"
-
-	para "He's my grandson!"
-
-	para "He always liked"
-	line "collecting things"
-	cont "even as a child!"
-	done
+; Now unused - see in_game_trades.asm
+;_FuchsiaHouse1Text2::
+;	text "Hmm? You've met"
+;	line "BILL?"
+;
+;	para "He's my grandson!"
+;
+;	para "He always liked"
+;	line "collecting things"
+;	cont "even as a child!"
+;	done
 
 _FuchsiaHouse1Text3::
 	text "BILL files his"