Merge pull request #595 from Phlosioneer/move-tutor

Move tutor

4 files changed, 150 insertions, 196 deletions

diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc
index 2f2ec1b3f..d0305ad4b 100644
--- a/data/maps/FallarborTown_House2/scripts.inc
+++ b/data/maps/FallarborTown_House2/scripts.inc
@@ -37,7 +37,7 @@ FallarborTown_House2_EventScript_2013D6:: @ 82013D6
 
 FallarborTown_House2_EventScript_20140C:: @ 820140C
 	msgbox FallarborTown_House2_Text_2015C3, MSGBOX_DEFAULT
-	special TeachMoveTutorMove
+	special TeachMoveRelearnerMove
 	waitstate
 	compare VAR_0x8004, 0
 	goto_if_eq FallarborTown_House2_EventScript_2013D6
diff --git a/data/menu_specialized.s b/data/menu_specialized.s
new file mode 100644
index 000000000..e88a68fcc
--- /dev/null
+++ b/data/menu_specialized.s
@@ -0,0 +1,148 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+	
+gUnknown_08625560:: @ 8625560
+	.incbin "graphics/pokenav/pokeball.4bpp"
+
+gUnknown_08625660:: @ 8625660
+	.incbin "graphics/pokenav/pokeball_placeholder.4bpp"
+	
+gUnknown_08625680:: @ 8625680
+	.incbin "graphics/pokenav/sparkle.gbapal"
+	
+gUnknown_086256A0:: @ 86255A0
+	.incbin "graphics/pokenav/sparkle.4bpp"
+	
+gUnknown_08625A20:: @ 8625A20
+	.2byte 0
+	.2byte 0xC000
+	.2byte 0x400
+	.2byte 0
+	
+gUnknown_08625A28:: @ 8625A28
+	.2byte 0
+	.2byte 0x4000
+	.2byte 0x800
+	.2byte 0
+	
+gUnknown_08625A30:: @ 8625A30
+	.2byte 0
+	.2byte 5
+	.2byte 0xFFFF
+	.2byte 0
+	
+gUnknown_08625A38:: @ 8625A38
+	.2byte 4
+	.2byte 5
+	.2byte 0xFFFF
+	.2byte 0
+	
+gUnknown_08625A40:: @ 8625A40
+	.4byte gUnknown_08625A30
+	.4byte gUnknown_08625A38
+
+gUnknown_08625A48:: @ 8625A48
+	.4byte NULL
+	.4byte 0x640800
+
+gUnknown_08625A50:: @ 8625A50
+	spr_template 0x64, 0x64, gUnknown_08625A20, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+gUnknown_08625A68:: @ 8625A68
+	.4byte NULL
+	.4byte 0x64
+
+gUnknown_08625A70:: @ 8625A70
+	.4byte gUnknown_08625560
+	.byte 0, 1, 0x65, 0
+	.4byte gUnknown_08625660
+	.2byte 0x20, 0x67
+	.4byte gPokenavConditionCancel_Gfx
+	.byte 0, 1, 0x66, 0
+	.4byte NULL, NULL
+
+gUnknown_08625A90:: @ 8625A90
+	.4byte gPokenavConditionCancel_Pal + 0x0
+	.byte 0x65, 0, 0, 0
+	.4byte gPokenavConditionCancel_Pal + 0x20
+	.byte 0x66, 0, 0, 0
+	.4byte NULL, NULL
+
+gUnknown_08625AA8:: @ 8625AA8
+	spr_template 0x65, 0x65, gUnknown_08625A28, gUnknown_08625A40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+gUnknown_08625AC0:: @ 8625AC0
+	.4byte gUnknown_086256A0
+	.byte 0x80, 3, 0x68, 0
+
+gUnknown_08625AC8:: @ 8625AC8
+	.4byte gUnknown_08625680
+	.byte 0x68, 0, 0, 0
+	
+gUnknown_08625AD0:: @ 8625AD0
+	.2byte 0
+	.2byte 0x4000
+	.2byte 0
+	.2byte 0
+	
+gUnknown_08625AD8:: @ 8625AD8
+	.2byte 0
+	.2byte 5
+	.2byte 4
+	.2byte 5
+	
+gUnknown_08625AE0:: @ 8625AE0
+	.2byte 8
+	.2byte 5
+	.2byte 12
+	.2byte 5
+	
+gUnknown_08625AE8:: @ 8625AE8
+	.2byte 16
+	.2byte 5
+	.2byte 20
+	.2byte 5
+	
+gUnknown_08625AF0:: @ 8625AF0
+	.2byte 24
+	.2byte 5
+	.2byte 0xFFFF
+	.2byte 0
+	
+gUnknown_08625AF8:: @ 8625AF8
+	.4byte gUnknown_08625AD8
+	.4byte gUnknown_08625AE0
+	
+gUnknown_08625B00:: @ 8625B00
+	.4byte gUnknown_08625AE8
+	.4byte gUnknown_08625AF0
+	
+gUnknown_08625B08:: @ 8625B08
+	.4byte gUnknown_08625AF8
+	.4byte gUnknown_08625B00
+	.4byte gUnknown_08625B08
+
+gUnknown_08625B14:: @ 8625B14
+	spr_template 0x68, 0x68, gUnknown_08625AD0, gUnknown_08625AF8, NULL gDummySpriteAffineAnimTable, sub_81D3564
+
+gUnknown_08625B2C:: @ 8625B2C
+	.2byte 0, 0xFFDD
+	.2byte 20, 0xFFE4
+	.2byte 33, 0xFFF6
+	.2byte 33, 10
+	.2byte 20, 28
+	.2byte 0, 35
+	.2byte 0xFFEC, 28
+	.2byte 0xFFDF, 10
+	.2byte 0xFFDF, 0xFFF6
+	.2byte 0xFFEC, 0xFFE4
+
+gUnknown_08625B54:: @ 8625B54
+	.4byte gUnknown_085EEA46
+	.4byte gUnknown_085EEA4E
+	.4byte gUnknown_085EEA55
+	.4byte gUnknown_085EEA63
+	.4byte gUnknown_085EEA6B
+	.4byte gUnknown_085EEA5D
diff --git a/data/rom_81D1C44.s b/data/rom_81D1C44.s
index 9a012a6a7..5fbab5c3a 100644
--- a/data/rom_81D1C44.s
+++ b/data/rom_81D1C44.s
@@ -3,200 +3,6 @@
 
 	.section .rodata
 
-gUnknown_086253E8:: @ 86253E8
-	.4byte 0x8010100
-	.4byte 0x80F02
-	.4byte 0x8011500
-	.4byte 0x180F12
-	.4byte 0xB010100
-	.4byte 0x180F08
-
-gUnknown_08625400:: @ 8625400
-	.byte 1, 2, 3
-
-gUnknown_08625403:: @ 8625403
-	.byte 0xFF
-
-gUnknown_08625404:: @ 8625404
-	.byte 0x40, 0, 0, 4, 1, 0, 0x60, 0xA6, 1, 0, 0, 0
-
-gUnknown_08625410:: @ 8625410
-	.byte 4, 5, 6, 7, 8, 9, 9, 0xA, 0xA, 0xB, 0xB, 0xC, 0xC, 0xD, 0xD, 0xD, 0xD, 0xE, 0xE, 0xE, 0xE, 0xF, 0xF, 0xF, 0xF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23
-
-gUnknown_08625510:: @ 8625510
-	.4byte 0x10010101
-	.4byte 0xA0F0C
-	.4byte 0x10010101
-	.4byte 0xCA0F0C
-	.4byte 0xA011301
-	.4byte 0x18A0F0C
-	.4byte 0x160F0401
-	.4byte 0x2020F04
-	.4byte 0x5081600
-	.4byte 0x25A0F04
-	.4byte 0xFF
-	.4byte NULL
-
-gUnknown_08625540:: @ 8625540
-	.4byte 0x5081600
-	.4byte 0x25A0F04
-
-gUnknown_08625548:: @ 8625548
-	.4byte NULL
-	.4byte sub_81D2BD0
-	.4byte NULL
-	.2byte 0
-	.2byte 0
-	.byte 2
-	.byte 0
-	.byte 8
-	.byte 0
-	.4byte 0x1003121
-	
-gUnknown_08625560:: @ 8625560
-	.incbin "graphics/pokenav/pokeball.4bpp"
-
-gUnknown_08625660:: @ 8625660
-	.incbin "graphics/pokenav/8625660.4bpp"
-	
-gUnknown_08625680:: @ 8625680
-	.incbin "graphics/pokenav/sparkle.gbapal"
-	
-gUnknown_086256A0:: @ 86255A0
-	.incbin "graphics/pokenav/sparkle.4bpp"
-	
-gUnknown_08625A20:: @ 8625A20
-	.2byte 0
-	.2byte 0xC000
-	.2byte 0x400
-	.2byte 0
-	
-gUnknown_08625A28:: @ 8625A28
-	.2byte 0
-	.2byte 0x4000
-	.2byte 0x800
-	.2byte 0
-	
-gUnknown_08625A30:: @ 8625A30
-	.2byte 0
-	.2byte 5
-	.2byte 0xFFFF
-	.2byte 0
-	
-gUnknown_08625A38:: @ 8625A38
-	.2byte 4
-	.2byte 5
-	.2byte 0xFFFF
-	.2byte 0
-	
-gUnknown_08625A40:: @ 8625A40
-	.4byte gUnknown_08625A30
-	.4byte gUnknown_08625A38
-
-gUnknown_08625A48:: @ 8625A48
-	.4byte NULL
-	.4byte 0x640800
-
-gUnknown_08625A50:: @ 8625A50
-	spr_template 0x64, 0x64, gUnknown_08625A20, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_08625A68:: @ 8625A68
-	.4byte NULL
-	.4byte 0x64
-
-gUnknown_08625A70:: @ 8625A70
-	.4byte gUnknown_08625560
-	.byte 0, 1, 0x65, 0
-	.4byte gUnknown_08625660
-	.2byte 0x20, 0x67
-	.4byte gPokenavConditionCancel_Gfx
-	.byte 0, 1, 0x66, 0
-	.4byte NULL, NULL
-
-gUnknown_08625A90:: @ 8625A90
-	.4byte gPokenavConditionCancel_Pal + 0x0
-	.byte 0x65, 0, 0, 0
-	.4byte gPokenavConditionCancel_Pal + 0x20
-	.byte 0x66, 0, 0, 0
-	.4byte NULL, NULL
-
-gUnknown_08625AA8:: @ 8625AA8
-	spr_template 0x65, 0x65, gUnknown_08625A28, gUnknown_08625A40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_08625AC0:: @ 8625AC0
-	.4byte gUnknown_086256A0
-	.byte 0x80, 3, 0x68, 0
-
-gUnknown_08625AC8:: @ 8625AC8
-	.4byte gUnknown_08625680
-	.byte 0x68, 0, 0, 0
-	
-gUnknown_08625AD0:: @ 8625AD0
-	.2byte 0
-	.2byte 0x4000
-	.2byte 0
-	.2byte 0
-	
-gUnknown_08625AD8:: @ 8625AD8
-	.2byte 0
-	.2byte 5
-	.2byte 4
-	.2byte 5
-	
-gUnknown_08625AE0:: @ 8625AE0
-	.2byte 8
-	.2byte 5
-	.2byte 12
-	.2byte 5
-	
-gUnknown_08625AE8:: @ 8625AE8
-	.2byte 16
-	.2byte 5
-	.2byte 20
-	.2byte 5
-	
-gUnknown_08625AF0:: @ 8625AF0
-	.2byte 24
-	.2byte 5
-	.2byte 0xFFFF
-	.2byte 0
-	
-gUnknown_08625AF8:: @ 8625AF8
-	.4byte gUnknown_08625AD8
-	.4byte gUnknown_08625AE0
-	
-gUnknown_08625B00:: @ 8625B00
-	.4byte gUnknown_08625AE8
-	.4byte gUnknown_08625AF0
-	
-gUnknown_08625B08:: @ 8625B08
-	.4byte gUnknown_08625AF8
-	.4byte gUnknown_08625B00
-	.4byte gUnknown_08625B08
-
-gUnknown_08625B14:: @ 8625B14
-	spr_template 0x68, 0x68, gUnknown_08625AD0, gUnknown_08625AF8, NULL gDummySpriteAffineAnimTable, sub_81D3564
-
-gUnknown_08625B2C:: @ 8625B2C
-	.2byte 0, 0xFFDD
-	.2byte 20, 0xFFE4
-	.2byte 33, 0xFFF6
-	.2byte 33, 10
-	.2byte 20, 28
-	.2byte 0, 35
-	.2byte 0xFFEC, 28
-	.2byte 0xFFDF, 10
-	.2byte 0xFFDF, 0xFFF6
-	.2byte 0xFFEC, 0xFFE4
-
-gUnknown_08625B54:: @ 8625B54
-	.4byte gUnknown_085EEA46
-	.4byte gUnknown_085EEA4E
-	.4byte gUnknown_085EEA55
-	.4byte gUnknown_085EEA63
-	.4byte gUnknown_085EEA6B
-	.4byte gUnknown_085EEA5D
-
 gUnknown_08625B6C:: @ 8625B6C
 @ apparently e-reader trainer data? idk
 .byte 0x6f, 0x57, 0x54, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x14, 0x0c, 0x0e, 0x23, 0x10, 0x47, 0x0a, 0x1f, 0x06, 0x24, 0x0e, 0x48, 0x0a, 0x0f, 0x06
diff --git a/data/specials.inc b/data/specials.inc
index d57c76bde..9364dcc46 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -235,7 +235,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_81B9770
 	def_special sub_81B9718
 	def_special sub_81B96D0
-	def_special TeachMoveTutorMove
+	def_special TeachMoveRelearnerMove
 	def_special GetRecordedCyclingRoadResults
 	def_special Special_BeginCyclingRoadChallenge
 	def_special GetPlayerAvatarBike