Lots of small tweaks

- Gave nicknames to the Galar Evolution trades, they're a bit different to regional variants n such
- The Throw Rock command now only increases flee chance by 50%. It seems like it may be a little TOO strong though, bit curious.
- Changed a bit of text here and there
- Made CHIKUCHIKU trade accessible, still need MICHELLE

README.md

@@ -119,6 +119,7 @@ QoL Enhancements
 - Traded Pokemon ("Outsiders") can now be nicknamed at the Name Rater's House.
 - HP bar has been doubled in speed, having a 1 frame delay per pixel rather than 2.
 - The blinking animation when hit by moves like Tackle now repeats 4 instead of 6 times, speeding up battles by a bit while not sacrificing impact.
+- The Rock in the Safari Zone now only raises the flee chance by 1.5x, rather than 2x, opening up new strategies.
 - PP symbol is displayed in the battle menu. PP displayed before, it just looks nicer now. Done by changing a straggler Japanese character.
 - Lorelei, Bruno, and Agatha now play the Gym Leader Battle theme.
 - Trainer DVs are perfect-15s.
@@ -267,7 +268,8 @@ The Evolution Stone Glitch is being made a feature by moving the Pokemon's const
 
 The following will apply:
 - Clefable for Moon Stone
-- Arcanine for Fire Stone
+- Electivire for Thunder Stone
+- Magmortar for Fire Stone
 - Poliwrath for Water Stone
 - Politoed for Heart Stone
 - Victreebel for Leaf Stone

data/events/trades.asm

@@ -30,7 +30,7 @@ TradeMons:
 	db SLOWBRO,    SLOWBRO_G,   TRADE_DIALOGSET_REGION,    "SLOWBRO@@@@"
 	db SLOWKING,   SLOWKING_G,  TRADE_DIALOGSET_REGION,    "SLOWKING@@@"
 	db WEEZING,    WEEZING_G,   TRADE_DIALOGSET_REGION,    "WEEZING@@@@"
-	db MR_MIME,    MR_RIME,     TRADE_DIALOGSET_CASUAL,    "MR.RIME@@@@"
+	db MR_MIME,    MR_RIME,     TRADE_DIALOGSET_CASUAL,    "CHURCHILL@@" ; Winston Churchill, notable "city gent" 
-	db PERSIAN,    PERRSERKER,  TRADE_DIALOGSET_HAPPY,     "PERRSERKER@"
+	db PERSIAN,    PERRSERKER,  TRADE_DIALOGSET_HAPPY,     "ERIK@@@@@@@" ; One of the most famous vikings
-	db MADAAMU,    SIRFETCHD,   TRADE_DIALOGSET_HAPPY,     "SIRFETCH'D@"
+	db MADAAMU,    SIRFETCHD,   TRADE_DIALOGSET_HAPPY,     "LANCELOT@@@" ; Influential knight of the round table
 	assert_table_length NUM_NPC_TRADES

data/pokemon/evos_moves.asm

@@ -1036,7 +1036,7 @@ BlottleEvosMoves:
 FarfetchdEvosMoves:
 ; Evolutions
 	db EV_LEVEL, 24, MADAAMU
-	db EV_ITEM, HEART_STONE, 1, SIRFETCHD
+	;db EV_ITEM, HEART_STONE, 1, SIRFETCHD
 	db 0
 ; Learnset
 	db 7, LEER
@@ -2231,7 +2231,7 @@ RaticateEvosMoves:
 NidorinoEvosMoves:
 ; Evolutions
 	db EV_ITEM, MOON_STONE, 1, NIDOREIGN
-	;db EV_ITEM, POISON_STONE, 1, NIDOKING
+	db EV_ITEM, POISON_STONE, 1, NIDOKING
 	db EV_LEVEL, 36, NIDOKING
 	db 0
 ; Learnset
@@ -2246,7 +2246,7 @@ NidorinoEvosMoves:
 NidorinaEvosMoves:
 ; Evolutions
 	db EV_ITEM, MOON_STONE, 1, NIDOREIGN
-	;db EV_ITEM, POISON_STONE, 1, NIDOQUEEN
+	db EV_ITEM, POISON_STONE, 1, NIDOQUEEN
 	db EV_LEVEL, 36, NIDOQUEEN
 	db 0
 ; Learnset

engine/battle/core.asm

@@ -195,8 +195,13 @@ StartBattle:
 	and a ; is escape factor 0?
 	jr z, .compareWithRandomValue
 ; escape factor is not 0
-; multiply b by 2 (making the mon more likely to run)
+; OG: multiply b by 2 (making the mon more likely to run)
-	sla b
+	;sla b
+; KEP: multiply b by 1.5x and add to a, making it more likely to run, but not as much as vanilla.
+	ld b, a ; load b into a - need this so add will work, add is for a only.
+	srl b ; divide b by 2
+	add a, b ; add b to a
+	ld a, b ; load a into b again to go to compareWithRandomValue
 	jr nc, .compareWithRandomValue
 ; cap b at 255
 	ld b, $ff

scripts/Route11Gate2F.asm

@@ -9,7 +9,7 @@ Route11Gate2F_TextPointers:
 
 Route11GateUpstairsText1:
 	text_asm
-	xor a ; TRADE_FOR_TERRY
+	ld a, TRADE_FOR_CHIKUCHIKU
 	ld [wWhichTrade], a
 	predef DoInGameTradeDialogue
 Route11GateUpstairsScriptEnd:

text/CinnabarLab.asm

@@ -20,7 +20,7 @@ _Lab1Text3::
 
 _Lab1Text4::
 	text "#MON LAB"
-	line "R-and-D Room"
+	line "R&D Room"
 	done
 
 _Lab1Text5::
@@ -28,7 +28,7 @@ _Lab1Text5::
 	line "Testing Room"
 	done
 
-_Lab1Text6::
+_Lab1Text6:: ; Rowan
 	text "I came here from"
 	line "afar to research"
 	cont "the myths of"

text/CinnabarLabMetronomeRoom.asm

@@ -33,6 +33,13 @@ _Lab3Text2::
 	text "EEVEE can evolve"
 	line "into 1 of 8 kinds"
 	cont "of #MON."
+	
+	para "I have seen it" ; Reference to the Evolution Stone Glitch, which we've made a feature.
+	line "evolve through"
+	cont "battling certain"
+	cont "#MON, but"
+	cont "nobody believes"
+	cont "me!"
 	done
 
 _Lab3Text3::

text/PewterNidoranHouse.asm

@@ -3,7 +3,7 @@ _PewterHouse1Text1::
 	text_end
 
 _PewterHouse1Text2::
-	text "NIDORAN sit!"
+	text "NIDORAN, sit!"
 	done
 
 _PewterHouse1Text3::