From 8e5f603a23d4fd1c3b585ab309d67989f81eb595 Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Wed, 5 Jul 2023 18:46:31 +0100
Subject: [PATCH] Gift Pokemon changes

The Gift Pokemon from vanilla now use the LGPE levels, which are all far more applicable for general use. With the Move Relearner's existence, it is unnecessary to hold back their levels anymore. This most notably means the Silph Co. Lapras is now Level 34, much more appropriate for general use.
---
 README.md                         | 3 ++-
 scripts/CinnabarLabFossilRoom.asm | 2 +-
 scripts/Daycare.asm               | 2 +-
 scripts/Route24.asm               | 2 +-
 scripts/SilphCo7F.asm             | 2 +-
 scripts/VermilionCity.asm         | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index d6587c6f..ab2445f2 100644
--- a/README.md
+++ b/README.md
@@ -124,6 +124,7 @@ QoL Enhancements
 ====
 - A girl option is now available, featuring the sprite from Pokemon Anniversary Red, which is based on Green's manga appearance.
 	- To accomodate this, Celadon Gym's trainers use their more neutral text from Crystal.
+	- The protagonist is also referred to in a gender neutral manner. This changes like, 2-3 lines in the whole game.
 - All 151 original Pokemon, plus an additional 100, can be obtained without the use of trading or glitches, including Mew!
 - Bag capacity is increased from 20 to 30 items.
 - Pokemon Box capacity is now 280 Pokemon with 14 boxes.
@@ -142,11 +143,11 @@ QoL Enhancements
 - 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.
-- The protagonist is referred to in a gender neutral manner.
 - PC added to Celadon Hotel where the invisible event usually is. Why not?
 - Artificial Save Delay has been removed.
 - Ultra Balls now have a Ball Modifier of 4, instead of 8. This makes them better for general-purpose than Great Balls. Safari Balls have the same effect by proxy. 
 - Yellow learnset changes are imported; eg. Flash Venonat, with tweaks made to ensure nothing is lost from RB either.
+- Gift Pokemon now use levels from LGPE; for example, the Silph Co. Lapras is now L34.
 - Event moves can now be taught via TM/HM;
 	- TM16 (Pay Day) can be taught to Fearow and Rapidash ('98 Shogakukan)
 	- TM23 (Dragon Rage) can be taught to Magikarp (July '98 Shogakukan)
diff --git a/scripts/CinnabarLabFossilRoom.asm b/scripts/CinnabarLabFossilRoom.asm
index 1743e5b3..17ca0eb2 100644
--- a/scripts/CinnabarLabFossilRoom.asm
+++ b/scripts/CinnabarLabFossilRoom.asm
@@ -77,7 +77,7 @@ Lab4Text1:
 	SetEvent EVENT_LAB_HANDING_OVER_FOSSIL_MON
 	ld a, [wFossilMon]
 	ld b, a
-	ld c, 30
+	ld c, 44
 	call GivePokemon
 	jr nc, .asm_75d93
 	ResetEvents EVENT_GAVE_FOSSIL_TO_LAB, EVENT_LAB_STILL_REVIVING_FOSSIL, EVENT_LAB_HANDING_OVER_FOSSIL_MON
diff --git a/scripts/Daycare.asm b/scripts/Daycare.asm
index abe5ec26..c64d6cb5 100644
--- a/scripts/Daycare.asm
+++ b/scripts/Daycare.asm
@@ -312,7 +312,7 @@ DaycareMelanie:
 	and a
 	jr nz, .refused ; imagine refusing a bulbasaur tbh
 	
-	lb bc, BULBASAUR, 10 ; load the bulbasaur
+	lb bc, BULBASAUR, 12 ; load the bulbasaur
 	call GivePokemon ; attempt to give the bulbasaur
 	jr nc, .fullParty ; if it's fucked just go here
 	ld a, HS_DAYCARE_BULBASAUR ; hide the bulbasaur
diff --git a/scripts/Route24.asm b/scripts/Route24.asm
index 8ca43def..3851a928 100644
--- a/scripts/Route24.asm
+++ b/scripts/Route24.asm
@@ -296,7 +296,7 @@ Route24Damian:
 	call GetMonName
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	lb bc, CHARMANDER, 10
+	lb bc, CHARMANDER, 14
 	call GivePokemon
 	jp nc, .fullParty
 	ld a, [wAddedToParty]
diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm
index 686d6146..26c00375 100644
--- a/scripts/SilphCo7F.asm
+++ b/scripts/SilphCo7F.asm
@@ -320,7 +320,7 @@ SilphCo7Text1:
 .givelapras
 	ld hl, .MeetLaprasGuyText
 	call PrintText
-	lb bc, LAPRAS, 15
+	lb bc, LAPRAS, 34
 	call GivePokemon
 	jr nc, .done
 	ld a, [wSimulatedJoypadStatesEnd]
diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm
index ee3cf27f..5357068c 100644
--- a/scripts/VermilionCity.asm
+++ b/scripts/VermilionCity.asm
@@ -456,7 +456,7 @@ OfficerJennySquirtle:
 	call GetMonName
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	lb bc, SQUIRTLE, 15
+	lb bc, SQUIRTLE, 16
 	call GivePokemon
 	ld a, [wAddedToParty]
 	and a