diff --git a/linker.ld b/linker.ld
index 2413211..d168d34 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1,7 +1,7 @@
 OUTPUT_ARCH(arm)
 MEMORY {
 
-		rom     : ORIGIN = (0x08000000 + 0x17b09a0), LENGTH = 32M
+		rom     : ORIGIN = (0x08000000 + 0x17b1480), LENGTH = 32M
         ewram   : ORIGIN = 0x02000000, LENGTH = 4M - 4k
 }
 
diff --git a/src/Learnsets.c b/src/Learnsets.c
index 4ab67ea..39683b4 100644
--- a/src/Learnsets.c
+++ b/src/Learnsets.c
@@ -4970,9 +4970,9 @@ static const struct LevelUpMove sLarvitarLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 9, MOVE_BITE),
 	LEVEL_UP_MOVE(12, MOVE_SCARYFACE),
 	LEVEL_UP_MOVE(14, MOVE_PAYBACK),
-	LEVEL_UP_MOVE(15, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(16, MOVE_SCREECH),
 	LEVEL_UP_MOVE(18, MOVE_STOMPINGTANTRUM),
-	LEVEL_UP_MOVE(21, MOVE_SCREECH),
+	LEVEL_UP_MOVE(21, MOVE_ROCKSLIDE),
 	LEVEL_UP_MOVE(24, MOVE_DARKPULSE),
 	LEVEL_UP_MOVE(27, MOVE_CRUNCH),
 	LEVEL_UP_MOVE(31, MOVE_EARTHQUAKE),
@@ -4993,9 +4993,9 @@ static const struct LevelUpMove sPupitarLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 9, MOVE_BITE),
 	LEVEL_UP_MOVE(12, MOVE_SCARYFACE),
 	LEVEL_UP_MOVE(14, MOVE_PAYBACK),
-	LEVEL_UP_MOVE(15, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(16, MOVE_SCREECH),
 	LEVEL_UP_MOVE(18, MOVE_STOMPINGTANTRUM),
-	LEVEL_UP_MOVE(21, MOVE_SCREECH),
+	LEVEL_UP_MOVE(21, MOVE_ROCKSLIDE),
 	LEVEL_UP_MOVE(24, MOVE_DARKPULSE),
 	LEVEL_UP_MOVE(27, MOVE_CRUNCH),
 	LEVEL_UP_MOVE(29, MOVE_IRONDEFENSE),
@@ -5019,9 +5019,9 @@ static const struct LevelUpMove sTyranitarLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 9, MOVE_BITE),
 	LEVEL_UP_MOVE(12, MOVE_SCARYFACE),
 	LEVEL_UP_MOVE(14, MOVE_PAYBACK),
-	LEVEL_UP_MOVE(15, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(16, MOVE_SCREECH),
 	LEVEL_UP_MOVE(18, MOVE_STOMPINGTANTRUM),
-	LEVEL_UP_MOVE(21, MOVE_SCREECH),
+	LEVEL_UP_MOVE(21, MOVE_ROCKSLIDE),
 	LEVEL_UP_MOVE(24, MOVE_DARKPULSE),
 	LEVEL_UP_MOVE(27, MOVE_CRUNCH),
 	LEVEL_UP_MOVE(29, MOVE_IRONDEFENSE),