From 57a00c9cd41061ac63698b6f9006a4cfcef6610f Mon Sep 17 00:00:00 2001
From: Pseurae <adhith.chand@gmail.com>
Date: Sat, 19 Oct 2024 07:26:03 +0000
Subject: [PATCH] Introduce a small change

---
 config.asm                       |  3 +++
 linker/text.ld                   |  1 +
 main.asm                         |  7 ++++++-
 scripts/center_disregard_egg.asm |  6 ++++++
 src/data/trainers.c              | 30 +++++++++++++++---------------
 5 files changed, 31 insertions(+), 16 deletions(-)
 create mode 100644 scripts/center_disregard_egg.asm

diff --git a/config.asm b/config.asm
index f921a20..16cf49f 100644
--- a/config.asm
+++ b/config.asm
@@ -96,6 +96,9 @@
 ; Trainer battle balances.
 .definelabel TRAINER_CHANGES, 1
 
+; Why would you need to heal an egg?
+.definelabel CENTER_DISREGARD_EGG, 1
+
 ; Bugfixes
 ; --------
 
diff --git a/linker/text.ld b/linker/text.ld
index fb3fd65..e8a1750 100644
--- a/linker/text.ld
+++ b/linker/text.ld
@@ -271,3 +271,4 @@ SetInputState = 0x80b6210 | 1;
 MainState_StartPageSwap = 0x80b61c8 | 1;
 GetTextEntryPosition = 0x80b6f44 | 1;
 ResetGpuAndVram = 0x80f9368 | 1;
+CountPartyNonEggMons = 0x8095b6c | 1;
diff --git a/main.asm b/main.asm
index 559748a..0932545 100644
--- a/main.asm
+++ b/main.asm
@@ -15,6 +15,10 @@
 .include "scripts/include/types.asm"
 .include "scripts/include/vars_flags.asm"
 
+; Remove spaces from the game header
+.org 0x80000A9
+.byte 0x0, 0x0, 0x0
+
 .org 0x88866c0
 .region 0x479940
 .endregion
@@ -50,8 +54,9 @@
 .include "scripts/ability_changer.asm"
 .include "scripts/autocase.asm"
 .include "scripts/autorun.asm"
-.include "scripts/birch_speech.asm"
 .include "scripts/bag_expansion.asm"
+.include "scripts/birch_speech.asm"
+.include "scripts/center_disregard_egg.asm"
 .include "scripts/colored_field_moves.asm"
 .include "scripts/colored_stats.asm"
 .include "scripts/emerald_save_prompt.asm"
diff --git a/scripts/center_disregard_egg.asm b/scripts/center_disregard_egg.asm
new file mode 100644
index 0000000..9b49e7f
--- /dev/null
+++ b/scripts/center_disregard_egg.asm
@@ -0,0 +1,6 @@
+.if CENTER_DISREGARD_EGG
+
+.org 0x8085D82
+bl 0x8095b6c
+
+.endif
\ No newline at end of file
diff --git a/src/data/trainers.c b/src/data/trainers.c
index 630fa1e..a688974 100644
--- a/src/data/trainers.c
+++ b/src/data/trainers.c
@@ -370,7 +370,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lizzie[2] = {
      },
     {
      .iv = 0,
-     .level = 4,
+     .level = 3,
      .species = SPECIES_ROTMANDER,
      },
 };
@@ -1838,7 +1838,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Mimi[2] = {
 const struct TrainerMonItemDefaultMoves gTrainerParty_Richie[1] = {
     {
      .iv = 0,
-     .level = 11,
+     .level = 8,
      .species = SPECIES_SURSKIT,
      .heldItem = ITEM_TAIJI_DUST,
      },
@@ -1847,7 +1847,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Richie[1] = {
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Orobas[1] = {
     {
      .iv = 40,
-     .level = 16,
+     .level = 14,
      .species = SPECIES_DIRTKROW,
      },
 };
@@ -2178,7 +2178,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shunkle[2] = {
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benji[1] = {
     {
      .iv = 0,
-     .level = 14,
+     .level = 12,
      .species = SPECIES_EYE_EYE,
      },
 };
@@ -4701,8 +4701,8 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allen[2] = {
      },
     {
      .iv = 0,
-     .level = 6,
-     .species = SPECIES_BOILBASAUR,
+     .level = 4,
+     .species = SPECIES_POLIHAG,
      },
 };
 
@@ -8321,17 +8321,17 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt4[1] = {
 const struct TrainerMonItemCustomMoves gTrainerParty_Zabulon[2] = {
     {
      .iv = 10,
-     .level = 11,
+     .level = 9,
      .species = SPECIES_HOUNDSOUR,
      .heldItem = ITEM_CINNAMON,
      .moves = { MOVE_EMBER, MOVE_GLARE, MOVE_LEER, MOVE_TACKLE },
      },
     {
      .iv = 30,
-     .level = 13,
+     .level = 9,
      .species = SPECIES_DIRTKROW,
      .heldItem = ITEM_STAR_PIECE,
-     .moves = { MOVE_PECK, MOVE_GUST, MOVE_GLARE, MOVE_NONE },
+     .moves = { MOVE_PECK, MOVE_ASTONISH, MOVE_GLARE, MOVE_NONE },
      },
 };
 
@@ -8562,12 +8562,12 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Salaryman5[1] = {
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kent[2] = {
     {
      .iv = 0,
-     .level = 14,
+     .level = 10,
      .species = SPECIES_EYE_EYE,
      },
     {
      .iv = 0,
-     .level = 14,
+     .level = 13,
      .species = SPECIES_EYE_EYE,
      },
 };
@@ -8746,7 +8746,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Harvey2[2] = {
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Janice[1] = {
     {
      .iv = 0,
-     .level = 9,
+     .level = 6,
      .species = SPECIES_ROTMANDER,
      },
 };
@@ -8876,12 +8876,12 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Crissy[2] = {
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rica[2] = {
     {
      .iv = 0,
-     .level = 4,
+     .level = 3,
      .species = SPECIES_GRAVEILL,
      },
     {
      .iv = 0,
-     .level = 4,
+     .level = 3,
      .species = SPECIES_GRAVEILL,
      },
 };
@@ -8959,7 +8959,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cinnabar[1] = {
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andromalius[1] = {
     {
      .iv = 70,
-     .level = 12,
+     .level = 8,
      .species = SPECIES_SECRETEGG,
      },
 };