#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions

engine/overworld/decorations.asm

@@ -378,12 +378,11 @@ PopulateDecoCategoryMenu:
 	ret
 
 .empty
-	ld hl, .Text_nothing_to_choose
+	ld hl, .NothingToChooseText
 	call MenuTextboxBackup
 	ret
 
-.Text_nothing_to_choose:
-	; There's nothing to choose.
+.NothingToChooseText:
 	text_far _NothingToChooseText
 	text_end
 
@@ -674,7 +673,7 @@ DecoAction_SetItUp:
 	ld a, [wBuffer1]
 	ld hl, wStringBuffer3
 	call GetDecorationName
-	ld hl, DecoText_PutAwayAndSetUp
+	ld hl, PutAwayAndSetUpText
 	call MenuTextboxBackup
 	xor a
 	ret
@@ -683,13 +682,13 @@ DecoAction_SetItUp:
 	ld a, [wMenuSelection]
 	ld hl, wStringBuffer3
 	call GetDecorationName
-	ld hl, DecoText_SetUpTheDeco
+	ld hl, SetUpTheDecoText
 	call MenuTextboxBackup
 	xor a
 	ret
 
 .alreadythere
-	ld hl, DecoText_AlreadySetUp
+	ld hl, AlreadySetUpText
 	call MenuTextboxBackup
 	scf
 	ret
@@ -710,19 +709,19 @@ DecoAction_TryPutItAway:
 	ld [wMenuSelection], a
 	ld hl, wStringBuffer3
 	call GetDecorationName
-	ld hl, DecoText_PutAwayTheDeco
+	ld hl, PutAwayTheDecoText
 	call MenuTextboxBackup
 	xor a
 	ret
 
 .nothingthere
-	ld hl, DecoText_NothingToPutAway
+	ld hl, NothingToPutAwayText
 	call MenuTextboxBackup
 	xor a
 	ret
 
 DecoAction_setupornament:
-	ld hl, UnknownText_0x26e41
+	ld hl, WhichSidePutOnText
 	call DecoAction_AskWhichSide
 	jr c, .cancel
 	call DecoAction_SetItUp_Ornament
@@ -736,7 +735,7 @@ DecoAction_setupornament:
 	ret
 
 DecoAction_putawayornament:
-	ld hl, DecoText_WhichSide
+	ld hl, WhichSidePutAwayText
 	call DecoAction_AskWhichSide
 	jr nc, .incave
 	xor a
@@ -771,7 +770,7 @@ DecoAction_SetItUp_Ornament:
 	ld a, [wMenuSelection]
 	ld [wSelectedDecoration], a
 	call .getwhichside
-	ld hl, DecoText_PutAwayAndSetUp
+	ld hl, PutAwayAndSetUpText
 	call MenuTextboxBackup
 	xor a
 	ret
@@ -783,13 +782,13 @@ DecoAction_SetItUp_Ornament:
 	ld a, [wMenuSelection]
 	ld hl, wStringBuffer3
 	call GetDecorationName
-	ld hl, DecoText_SetUpTheDeco
+	ld hl, SetUpTheDecoText
 	call MenuTextboxBackup
 	xor a
 	ret
 
 .failed
-	ld hl, DecoText_AlreadySetUp
+	ld hl, AlreadySetUpText
 	call MenuTextboxBackup
 	scf
 	ret
@@ -804,8 +803,7 @@ DecoAction_SetItUp_Ornament:
 	ld [wOtherDecoration], a
 	ret
 
-UnknownText_0x26e41:
-	; Which side do you want to put it on?
+WhichSidePutOnText:
 	text_far _WhichSidePutOnText
 	text_end
 
@@ -819,19 +817,18 @@ DecoAction_PutItAway_Ornament:
 	ld [wBuffer5], a
 	xor a
 	ld [wSelectedDecoration], a
-	ld hl, DecoText_PutAwayTheDeco
+	ld hl, PutAwayTheDecoText
 	call MenuTextboxBackup
 	xor a
 	ret
 
 .nothingthere
-	ld hl, DecoText_NothingToPutAway
+	ld hl, NothingToPutAwayText
 	call MenuTextboxBackup
 	xor a
 	ret
 
-DecoText_WhichSide:
-	; Which side do you want to put away?
+WhichSidePutAwayText:
 	text_far _WhichSidePutAwayText
 	text_end
 
@@ -883,28 +880,23 @@ MenuData_0x26eb3:
 	db "LEFT SIDE@"
 	db "CANCEL@"
 
-DecoText_PutAwayTheDeco:
-	; Put away the @ .
+PutAwayTheDecoText:
 	text_far _PutAwayTheDecoText
 	text_end
 
-DecoText_NothingToPutAway:
-	; There's nothing to put away.
+NothingToPutAwayText:
 	text_far _NothingToPutAwayText
 	text_end
 
-DecoText_SetUpTheDeco:
-	; Set up the @ .
+SetUpTheDecoText:
 	text_far _SetUpTheDecoText
 	text_end
 
-DecoText_PutAwayAndSetUp:
-	; Put away the @ and set up the @ .
+PutAwayAndSetUpText:
 	text_far _PutAwayAndSetUpText
 	text_end
 
-DecoText_AlreadySetUp:
-	; That's already set up.
+AlreadySetUpText:
 	text_far _AlreadySetUpText
 	text_end
 
@@ -1005,38 +997,34 @@ DecorationDesc_PosterPointers:
 
 DecorationDesc_TownMapPoster:
 	opentext
-	writetext .TownMapText
+	writetext .LookTownMapText
 	waitbutton
 	special OverworldTownMap
 	closetext
 	end
 
-.TownMapText:
-	; It's the TOWN MAP.
+.LookTownMapText:
 	text_far _LookTownMapText
 	text_end
 
 DecorationDesc_PikachuPoster:
-	jumptext .PikaPosterText
+	jumptext .LookPikachuPosterText
 
-.PikaPosterText:
-	; It's a poster of a cute PIKACHU.
+.LookPikachuPosterText:
 	text_far _LookPikachuPosterText
 	text_end
 
 DecorationDesc_ClefairyPoster:
-	jumptext .ClefairyPosterText
+	jumptext .LookClefairyPosterText
 
-.ClefairyPosterText:
-	; It's a poster of a cute CLEFAIRY.
+.LookClefairyPosterText:
 	text_far _LookClefairyPosterText
 	text_end
 
 DecorationDesc_JigglypuffPoster:
-	jumptext .JigglypuffPosterText
+	jumptext .LookJigglypuffPosterText
 
-.JigglypuffPosterText:
-	; It's a poster of a cute JIGGLYPUFF.
+.LookJigglypuffPosterText:
 	text_far _LookJigglypuffPosterText
 	text_end
 
@@ -1064,10 +1052,9 @@ DecorationDesc_OrnamentOrConsole:
 	ret
 
 .OrnamentConsoleScript:
-	jumptext .OrnamentConsoleText
+	jumptext .LookAdorableDecoText
 
-.OrnamentConsoleText:
-	; It's an adorable @ .
+.LookAdorableDecoText:
 	text_far _LookAdorableDecoText
 	text_end
 
@@ -1077,10 +1064,9 @@ DecorationDesc_GiantOrnament:
 	ret
 
 .BigDollScript:
-	jumptext .BigDollText
+	jumptext .LookGiantDecoText
 
-.BigDollText:
-	; A giant doll! It's fluffy and cuddly.
+.LookGiantDecoText:
 	text_far _LookGiantDecoText
 	text_end
 

engine/overworld/scripting.asm

@@ -530,7 +530,7 @@ GiveItemScript:
 	end
 
 ReceivedItemText:
-	text_far UnknownText_0x1c4719
+	text_far _ReceivedItemText
 	text_end
 
 Script_verbosegiveitemvar:
@@ -622,11 +622,11 @@ CurItemName:
 	ret
 
 PutItemInPocketText:
-	text_far UnknownText_0x1c472c
+	text_far _PutItemInPocketText
 	text_end
 
 PocketIsFullText:
-	text_far UnknownText_0x1c474b
+	text_far _PocketIsFullText
 	text_end
 
 Script_pokemart:

engine/overworld/select_menu.asm

@@ -5,14 +5,14 @@ SelectMenu::
 
 .NotRegistered:
 	call OpenText
-	ld b, BANK(ItemMayBeRegisteredText)
-	ld hl, ItemMayBeRegisteredText
+	ld b, BANK(MayRegisterItemText)
+	ld hl, MayRegisterItemText
 	call MapTextbox
 	call WaitButton
 	jp CloseText
 
-ItemMayBeRegisteredText:
-	text_far UnknownText_0x1c1cf3
+MayRegisterItemText:
+	text_far _MayRegisterItemText
 	text_end
 
 CheckRegisteredItem:

engine/overworld/wildmons.asm

@@ -821,7 +821,7 @@ RandomUnseenWildMon:
 	ld a, c
 	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
-	ld hl, .SawRareMonText
+	ld hl, .JustSawSomeRareMonText
 	call PrintText
 	xor a
 	ld [wScriptVar], a
@@ -832,8 +832,7 @@ RandomUnseenWildMon:
 	ld [wScriptVar], a
 	ret
 
-.SawRareMonText:
-	; I just saw some rare @  in @ . I'll call you if I see another rare #MON, OK?
+.JustSawSomeRareMonText:
 	text_far _JustSawSomeRareMonText
 	text_end