Reset game

snallapa · Jan 15, 2020 · 5d10cdb · 5d10cdb
1 parent cf118ed
commit 5d10cdb
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/data/maps/LavaridgeTown_Mart/scripts.inc b/data/maps/LavaridgeTown_Mart/scripts.inc
@@ -22,6 +22,7 @@ LavaridgeTown_Mart_Pokemart: @ 81FF9E8
 	.2byte ITEM_REVIVE
 	.2byte ITEM_SUPER_REPEL
 	.2byte ITEM_X_SPEED
+	.2byte ITEM_TRADE_STONE
 	.2byte ITEM_NONE
 	release
 	end

diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
@@ -28,6 +28,7 @@ LilycoveCity_DepartmentStore_2F_Pokemart1: @ 821FB60
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_ULTRA_BALL
+	.2byte ITEM_SHADOW_BALL
 	.2byte ITEM_ESCAPE_ROPE
 	.2byte ITEM_FULL_HEAL
 	.2byte ITEM_ANTIDOTE

diff --git a/src/battle_setup.c b/src/battle_setup.c
@@ -898,7 +898,7 @@ static void CB2_GiveStarter(void)
 
     *GetVarPointer(VAR_STARTER_MON) = gSpecialVar_Result;
     starterMon = GetStarterPokemon(gSpecialVar_Result);
-    ScriptGiveMon(starterMon, 100, ITEM_NONE, 0, 0, 0);
+    ScriptGiveMon(starterMon, 5, ITEM_NONE, 0, 0, 0);
     ResetTasks();
     PlayBattleBGM();
     SetMainCallback2(CB2_StartFirstBattle);

diff --git a/src/player_pc.c b/src/player_pc.c
@@ -170,8 +170,6 @@ static const struct MenuAction gPCText_ItemPCOptionsText[] =
 static const struct ItemSlot gNewGamePCItems[] =
 {
     { ITEM_POTION, 1 },
-    { ITEM_SHADOW_BALL, 1 },
-    { ITEM_TRADE_STONE, 1 },
     { ITEM_NONE, 0 }
 };
 

diff --git a/src/starter_choose.c b/src/starter_choose.c
@@ -126,9 +126,9 @@ static const u8 sStarterLabelCoords[][2] =
 
 static const u16 sStarterMon[STARTER_MON_COUNT] =
 {
+    SPECIES_TREECKO,
+    SPECIES_TORCHIC,
     SPECIES_MUDKIP,
-    SPECIES_RAYQUAZA,
-    SPECIES_SQUIRTLE,
 };
 
 static const struct BgTemplate gUnknown_085B1E00[3] =