Merge branch 'master' into pokenav-decomp-again

2 files changed, 2 insertions, 80 deletions

diff --git a/data/text/contest_text_pointers.inc b/data/text/contest_text_pointers.inc
deleted file mode 100644
index f9cf4b70e..000000000
--- a/data/text/contest_text_pointers.inc
+++ /dev/null
@@ -1,78 +0,0 @@
-	.align 2
-gContestEffectDescriptionPointers:: @ 8587C50
-	.4byte gContestEffect00hDescription
-	.4byte gContestEffect01hDescription
-	.4byte gContestEffect02hDescription
-	.4byte gContestEffect03hDescription
-	.4byte gContestEffect04hDescription
-	.4byte gContestEffect05hDescription
-	.4byte gContestEffect06hDescription
-	.4byte gContestEffect07hDescription
-	.4byte gContestEffect08hDescription
-	.4byte gContestEffect09hDescription
-	.4byte gContestEffect0AhDescription
-	.4byte gContestEffect0BhDescription
-	.4byte gContestEffect0ChDescription
-	.4byte gContestEffect0DhDescription
-	.4byte gContestEffect0EhDescription
-	.4byte gContestEffect0FhDescription
-	.4byte gContestEffect10hDescription
-	.4byte gContestEffect11hDescription
-	.4byte gContestEffect12hDescription
-	.4byte gContestEffect13hDescription
-	.4byte gContestEffect14hDescription
-	.4byte gContestEffect15hDescription
-	.4byte gContestEffect16hDescription
-	.4byte gContestEffect17hDescription
-	.4byte gContestEffect18hDescription
-	.4byte gContestEffect19hDescription
-	.4byte gContestEffect1AhDescription
-	.4byte gContestEffect1BhDescription
-	.4byte gContestEffect1ChDescription
-	.4byte gContestEffect1DhDescription
-	.4byte gContestEffect1EhDescription
-	.4byte gContestEffect1FhDescription
-	.4byte gContestEffect20hDescription
-	.4byte gContestEffect21hDescription
-	.4byte gContestEffect22hDescription
-	.4byte gContestEffect23hDescription
-	.4byte gContestEffect24hDescription
-	.4byte gContestEffect25hDescription
-	.4byte gContestEffect26hDescription
-	.4byte gContestEffect27hDescription
-	.4byte gContestEffect28hDescription
-	.4byte gContestEffect29hDescription
-	.4byte gContestEffect2AhDescription
-	.4byte gContestEffect2BhDescription
-	.4byte gContestEffect2ChDescription
-	.4byte gContestEffect2DhDescription
-	.4byte gContestEffect2EhDescription
-	.4byte gContestEffect2FhDescription
-
-@ 8587D10
-@ Unreferenced array of pointers to move names.
-@ All of the moves except Conversion are combo starters, so this may have
-@ been an early list of combo starters.
-	.align 2
-	.4byte gUnusedContestMoveName0
-	.4byte gUnusedContestMoveName0
-	.4byte gUnusedContestMoveName1
-	.4byte gUnusedContestMoveName2
-	.4byte gUnusedContestMoveName3
-	.4byte gUnusedContestMoveName4
-	.4byte gUnusedContestMoveName5
-	.4byte gUnusedContestMoveName6
-	.4byte gUnusedContestMoveName7
-	.4byte gUnusedContestMoveName8
-	.4byte gUnusedContestMoveName9
-	.4byte gUnusedContestMoveName10
-	.4byte gUnusedContestMoveName11
-	.4byte gUnusedContestMoveName12
-
-	.align 2
-gContestMoveTypeTextPointers:: @ 8587D48
-	.4byte gContestMoveTypeCoolText
-	.4byte gContestMoveTypeBeautyText
-	.4byte gContestMoveTypeCuteText
-	.4byte gContestMoveTypeSmartText
-	.4byte gContestMoveTypeToughText
diff --git a/data/text/surf.inc b/data/text/surf.inc
index 2751dae7b..31c197222 100644
--- a/data/text/surf.inc
+++ b/data/text/surf.inc
@@ -1,5 +1,5 @@
-gUnknown_08272FD6:: @ 8272FD6
+gText_WantToUseSurf:: @ 8272FD6
 	.string "The water is dyed a deep blue…\nWould you like to SURF?$"
 
-gUnknown_0827300D:: @ 827300D
+gText_PlayerUsedSurf:: @ 827300D
 	.string "{STR_VAR_1} used SURF!$"